From a52736a4302f5cf07c36de2712b6e37358fdf44f Mon Sep 17 00:00:00 2001 From: Andrei Malashkin Date: Tue, 24 Sep 2024 10:44:35 +0200 Subject: [PATCH] remove cm_deploy from parallel-crypto3 --- parallel-crypto3/CMakeLists.txt | 1 - .../libs/parallel-containers/CMakeLists.txt | 6 +++--- parallel-crypto3/libs/parallel-math/CMakeLists.txt | 9 ++++----- parallel-crypto3/libs/parallel-zk/CMakeLists.txt | 9 ++++----- .../libs/parallelization-utils/CMakeLists.txt | 10 ++++------ 5 files changed, 15 insertions(+), 20 deletions(-) diff --git a/parallel-crypto3/CMakeLists.txt b/parallel-crypto3/CMakeLists.txt index e4906392e2..00fb5f9d50 100644 --- a/parallel-crypto3/CMakeLists.txt +++ b/parallel-crypto3/CMakeLists.txt @@ -29,7 +29,6 @@ endif() # TODO: check what is actually required here include(CMConfig) -include(CMDeploy) include(CMSetupVersion) # TODO: beutify entire cmake tree of parallel crypto3 modules the same way we did in origin crypto3 diff --git a/parallel-crypto3/libs/parallel-containers/CMakeLists.txt b/parallel-crypto3/libs/parallel-containers/CMakeLists.txt index 699fd04800..8313bde9dc 100644 --- a/parallel-crypto3/libs/parallel-containers/CMakeLists.txt +++ b/parallel-crypto3/libs/parallel-containers/CMakeLists.txt @@ -28,7 +28,6 @@ include(CMSetupVersion) cm_workspace(actor) -include(CMDeploy) include(CMSetupVersion) if (NOT Boost_FOUND AND NOT CMAKE_CROSSCOMPILING) @@ -56,6 +55,7 @@ list(APPEND ${CURRENT_PROJECT_NAME}_SOURCES cm_setup_version(VERSION 0.1.0 PREFIX ${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME}) add_library(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INTERFACE) +add_library(${CMAKE_WORKSPACE_NAME}::${CURRENT_PROJECT_NAME} ALIAS ${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME}) set_target_properties(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} PROPERTIES EXPORT_NAME ${CURRENT_PROJECT_NAME}) @@ -75,8 +75,6 @@ target_include_directories(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INTER ${Boost_INCLUDE_DIRS}) -cm_deploy(TARGETS ${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INCLUDE include NAMESPACE ${CMAKE_WORKSPACE_NAME}::) - if (BUILD_TESTS) add_subdirectory(test) endif () @@ -85,3 +83,5 @@ if (BUILD_EXAMPLES) add_subdirectory(example) endif () +install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) diff --git a/parallel-crypto3/libs/parallel-math/CMakeLists.txt b/parallel-crypto3/libs/parallel-math/CMakeLists.txt index fbf51db388..7c755e0f85 100644 --- a/parallel-crypto3/libs/parallel-math/CMakeLists.txt +++ b/parallel-crypto3/libs/parallel-math/CMakeLists.txt @@ -16,11 +16,11 @@ endif() cm_project(math WORKSPACE_NAME ${CMAKE_WORKSPACE_NAME} LANGUAGES ASM C CXX) cm_find_package(CM) -include(CMDeploy) cm_setup_version(VERSION 0.1.0 PREFIX ${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME}) add_library(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INTERFACE) +add_library(${CMAKE_WORKSPACE_NAME}::${CURRENT_PROJECT_NAME} ALIAS ${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME}) set_target_properties(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} PROPERTIES EXPORT_NAME ${CURRENT_PROJECT_NAME}) @@ -42,8 +42,7 @@ target_link_libraries(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INTERFACE Boost::random ) -cm_deploy(TARGETS ${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} - INCLUDE include - NAMESPACE ${CMAKE_WORKSPACE_NAME}::) - cm_add_test_subdirectory(test) + +install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) diff --git a/parallel-crypto3/libs/parallel-zk/CMakeLists.txt b/parallel-crypto3/libs/parallel-zk/CMakeLists.txt index d24a865f84..d409cf5cab 100644 --- a/parallel-crypto3/libs/parallel-zk/CMakeLists.txt +++ b/parallel-crypto3/libs/parallel-zk/CMakeLists.txt @@ -18,12 +18,12 @@ endif() cm_project(zk WORKSPACE_NAME ${CMAKE_WORKSPACE_NAME} LANGUAGES C CXX) -include(CMDeploy) include(FindPkgConfig) cm_setup_version(VERSION 0.1.0 PREFIX ${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME}) add_library(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INTERFACE) +add_library(${CMAKE_WORKSPACE_NAME}::${CURRENT_PROJECT_NAME} ALIAS ${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME}) set_target_properties(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} PROPERTIES EXPORT_NAME ${CURRENT_PROJECT_NAME}) @@ -53,9 +53,8 @@ target_link_libraries(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INTERFACE # crypto3::benchmark_tools ) -cm_deploy(TARGETS ${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} - INCLUDE include - NAMESPACE ${CMAKE_WORKSPACE_NAME}::) - include(CMTest) cm_add_test_subdirectory(test) + +install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) diff --git a/parallel-crypto3/libs/parallelization-utils/CMakeLists.txt b/parallel-crypto3/libs/parallelization-utils/CMakeLists.txt index 338fbeb0f6..05c5df5d4d 100644 --- a/parallel-crypto3/libs/parallelization-utils/CMakeLists.txt +++ b/parallel-crypto3/libs/parallelization-utils/CMakeLists.txt @@ -23,7 +23,6 @@ if(NOT Boost_FOUND AND NOT CMAKE_CROSSCOMPILING) endif() cm_find_package(CM) -include(CMDeploy) include(FindPkgConfig) option(BUILD_WITH_CCACHE "Build with ccache usage" TRUE) @@ -46,6 +45,7 @@ list(APPEND ${CURRENT_PROJECT_NAME}_SOURCES ${${CURRENT_PROJECT_NAME}_UNGROUPED_ cm_setup_version(VERSION 0.1.0 PREFIX ${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME}) add_library(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INTERFACE) +add_library(${CMAKE_WORKSPACE_NAME}::${CURRENT_PROJECT_NAME} ALIAS ${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME}) set_target_properties(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} PROPERTIES EXPORT_NAME ${CURRENT_PROJECT_NAME}) @@ -59,9 +59,7 @@ target_include_directories(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INTER target_link_libraries(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INTERFACE ${Boost_LIBRARIES}) -cm_deploy(TARGETS ${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} - INCLUDE include - NAMESPACE ${CMAKE_WORKSPACE_NAME}::) - - cm_add_test_subdirectory(test) + +install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})