cleanup top cmake

NilFoundation · May 29, 2024 · 66096ae · 66096ae · x-mass · May 30, 2024
1 parent 2cfaa0d
commit 66096ae
Show file tree

Hide file tree

Showing 54 changed files with 90 additions and 497 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -23,9 +23,8 @@ cm_workspace(crypto3)
 cm_setup_version(VERSION 0.3.0 PREFIX ${CMAKE_WORKSPACE_NAME})
 
 option(BUILD_SHARED_LIBS "Build shared library" FALSE) # TODO: it makes no sense for header-only lib, remove
-option(USE_STATIC_BOOST "Use static libraries for Boost" FALSE)
-option(BUILD_TESTS "Include tests to `all` target" FALSE) # used by CMTest module
-option(CMAKE_ENABLE_TESTS "Enable tests" FALSE) # used by CMTest module
+option(Boost_USE_STATIC_LIBS "Use static libraries for Boost" OFF)
+option(ENABLE_TESTS "Enable tests" TRUE) # used by CMTest module
 option(BUILD_BENCH_TESTS "Build performance benchmark tests" FALSE)
 option(BUILD_DOCS "Build with configuring Doxygen documentation compiler" FALSE)
 
@@ -40,18 +39,10 @@ else()
     target_architecture(CMAKE_TARGET_ARCHITECTURE)
 endif()
 
-if(USE_STATIC_BOOST)
-    set(Boost_USE_STATIC_LIBS ON)
-else()
-    set(Boost_USE_STATIC_LIBS OFF)
-endif()
-
-# TODO: in subdirs use Boost::lib_name instead of wide ${Boost_LIBRARIES}, split next lines into 2 find_package calls
-set(BOOST_COMPONENTS "container;random;system")
-if(CMAKE_ENABLE_TESTS)
-    list(APPEND BOOST_COMPONENTS "unit_test_framework")
+find_package(Boost REQUIRED COMPONENTS container random filesystem log log_setup program_options thread system)
+if(ENABLE_TESTS)
+    find_package(Boost REQUIRED COMPONENTS unit_test_framework timer)
 endif()
-find_package(Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS})
 
 add_subdirectories("${CMAKE_CURRENT_LIST_DIR}/libs/")
 add_subdirectories("${CMAKE_CURRENT_LIST_DIR}/libs/marshalling")

diff --git a/libs/algebra/CMakeLists.txt b/libs/algebra/CMakeLists.txt
@@ -54,8 +54,7 @@ target_include_directories(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INTER
                            $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>)
 
 target_link_libraries(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INTERFACE
-                      ${CMAKE_WORKSPACE_NAME}::multiprecision
-                      Boost::unit_test_framework)
+                      ${CMAKE_WORKSPACE_NAME}::multiprecision)
 
 cm_deploy(TARGETS ${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME}
           INCLUDE include

diff --git a/libs/algebra/example/CMakeLists.txt b/libs/algebra/example/CMakeLists.txt
@@ -12,8 +12,8 @@ macro(define_algebra_example name)
                           ${CMAKE_WORKSPACE_NAME}_algebra
 
                           $<TARGET_NAME_IF_EXISTS:boost_multiprecision>
+                      )
 
-                          ${Boost_LIBRARIES})
     set_target_properties(algebra_${name}_example PROPERTIES CXX_STANDARD 14)
 endmacro()
 

diff --git a/libs/algebra/test/bench_test/CMakeLists.txt b/libs/algebra/test/bench_test/CMakeLists.txt
@@ -8,27 +8,13 @@
 
 include(CMTest)
 
-if(NOT Boost_UNIT_TEST_FRAMEWORK_FOUND)
-    find_package(Boost REQUIRED COMPONENTS unit_test_framework)
-endif()
-
 add_custom_target(algebra_runtime_bench_tests)
 
 macro(define_runtime_algebra_test name)
     set(test_name "algebra_${name}_bench_test")
     add_dependencies(algebra_runtime_bench_tests ${test_name})
 
-    set(additional_args "")
-    if(ENABLE_JUNIT_TEST_OUTPUT)
-        set(TEST_RESULTS_DIR "${CMAKE_CURRENT_BINARY_DIR}/junit_results")
-        set(TEST_LOGS_DIR "${TEST_RESULTS_DIR}/logs")
-        file(MAKE_DIRECTORY ${TEST_LOGS_DIR})
-
-        set(additional_args "--log_format=JUNIT"
-                            "--log_sink=${TEST_LOGS_DIR}/${test_name}.xml")
-    endif()
-
-    cm_test(NAME ${test_name} SOURCES ${name}.cpp ARGS ${additional_args})
+    cm_test(NAME ${test_name} SOURCES ${name}.cpp)
 
     target_include_directories(${test_name} PRIVATE
                                "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
@@ -39,13 +25,6 @@ macro(define_runtime_algebra_test name)
     set_target_properties(${test_name} PROPERTIES CXX_STANDARD 17
         CXX_STANDARD_REQUIRED TRUE)
 
-    get_target_property(target_type Boost::unit_test_framework TYPE)
-    if(target_type STREQUAL "SHARED_LIB")
-        target_compile_definitions(${test_name} PRIVATE BOOST_TEST_DYN_LINK)
-    elseif(target_type STREQUAL "STATIC_LIB")
-
-    endif()
-
     if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
         target_compile_options(${test_name} PRIVATE "-fconstexpr-steps=2147483647")
     elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")

diff --git a/libs/block/CMakeLists.txt b/libs/block/CMakeLists.txt
@@ -27,10 +27,6 @@ endif()
 
 cm_project(block WORKSPACE_NAME ${CMAKE_WORKSPACE_NAME} LANGUAGES C CXX)
 
-if((NOT Boost_CONTAINER_FOUND OR NOT Boost_FOUND) AND NOT CMAKE_CROSSCOMPILING)
-    find_package(Boost COMPONENTS REQUIRED container)
-endif()
-
 include(TargetArchitecture)
 include(TargetConfiguration)
 include(PlatformConfiguration)
@@ -492,7 +488,7 @@ elseif(${CMAKE_TARGET_ARCHITECTURE} STREQUAL "ppc64")
 endif()
 
 target_link_libraries(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INTERFACE
-                      ${Boost_LIBRARIES})
+                      Boost::container)
 
 target_include_directories(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INTERFACE
                            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>

diff --git a/libs/block/test/CMakeLists.txt b/libs/block/test/CMakeLists.txt
@@ -6,12 +6,8 @@
 # http://www.boost.org/LICENSE_1_0.txt
 #---------------------------------------------------------------------------#
 
-if(NOT Boost_UNIT_TEST_FRAMEWORK_FOUND)
-    find_package(Boost REQUIRED COMPONENTS unit_test_framework)
-endif()
-
 cm_test_link_libraries(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME}
-                       ${Boost_LIBRARIES})
+                       Boost::unit_test_framework)
 
 macro(define_block_cipher_test name)
     set(test_name "block_${name}_test")
@@ -28,13 +24,6 @@ macro(define_block_cipher_test name)
         set_target_properties(${test_name} PROPERTIES CXX_STANDARD 14)
     endif()
 
-    get_target_property(target_type Boost::unit_test_framework TYPE)
-    if(target_type STREQUAL "SHARED_LIB")
-        target_compile_definitions(${test_name} PRIVATE BOOST_TEST_DYN_LINK)
-    elseif(target_type STREQUAL "STATIC_LIB")
-
-    endif()
-
     string(CONCAT TEST_DATA ${CMAKE_CURRENT_SOURCE_DIR} "/data/" "${name}" ".json")
     target_compile_definitions(${test_name} PRIVATE TEST_DATA="${TEST_DATA}")
 endmacro()

diff --git a/libs/codec/CMakeLists.txt b/libs/codec/CMakeLists.txt
@@ -28,10 +28,6 @@ endif()
 
 cm_project(codec WORKSPACE_NAME ${CMAKE_WORKSPACE_NAME} LANGUAGES C CXX)
 
-if((NOT Boost_CONTAINER_FOUND OR NOT Boost_FOUND) AND NOT CMAKE_CROSSCOMPILING)
-    find_package(Boost COMPONENTS REQUIRED container)
-endif()
-
 option(CRYPTO3_CODEC_BASE58 "Build unit tests" TRUE)
 
 set(BUILD_WITH_CONFIGURATION_FILE_DIR "${CMAKE_CURRENT_LIST_DIR}/cmake" CACHE STRING "Directory for build.hpp lookup")
@@ -78,7 +74,7 @@ set_target_properties(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} PROPERTIES
 target_link_libraries(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INTERFACE
                       $<$<BOOL:${CRYPTO3_CODEC_BASE58}>:${CMAKE_WORKSPACE_NAME}::multiprecision>
 
-                      ${Boost_LIBRARIES})
+                      Boost::container)
 
 target_include_directories(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INTERFACE
                            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>

diff --git a/libs/codec/test/CMakeLists.txt b/libs/codec/test/CMakeLists.txt
@@ -8,14 +8,10 @@
 
 include(CMTest)
 
-if(NOT Boost_UNIT_TEST_FRAMEWORK_FOUND)
-    find_package(Boost REQUIRED COMPONENTS unit_test_framework)
-endif()
-
 cm_test_link_libraries(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME}
                        ${CMAKE_WORKSPACE_NAME}::multiprecision
 
-                       ${Boost_LIBRARIES})
+                       Boost::unit_test_framework)
 
 macro(define_codec_test name)
     cm_test(NAME codec_${name}_test SOURCES ${name}.cpp)
@@ -32,12 +28,6 @@ macro(define_codec_test name)
                               CXX_STANDARD_REQUIRED TRUE)
     endif()
 
-    get_target_property(target_type Boost::unit_test_framework TYPE)
-    if(target_type STREQUAL "SHARED_LIB")
-        target_compile_definitions(codec_${name}_test PRIVATE BOOST_TEST_DYN_LINK)
-    elseif(target_type STREQUAL "STATIC_LIB")
-
-    endif()
 endmacro()
 
 set(TESTS_NAMES "hex" "base")

diff --git a/libs/containers/CMakeLists.txt b/libs/containers/CMakeLists.txt
@@ -42,10 +42,6 @@ cm_workspace(crypto3)
 include(CMDeploy)
 include(CMSetupVersion)
 
-if (NOT Boost_FOUND AND NOT CMAKE_CROSSCOMPILING)
-    find_package(Boost COMPONENTS REQUIRED filesystem)
-endif ()
-
 cm_project(containers WORKSPACE_NAME ${CMAKE_WORKSPACE_NAME})
 
 option(BUILD_DOXYGEN_DOCS "Build with configuring Doxygen documentation compiler" TRUE)
@@ -76,7 +72,7 @@ target_link_libraries(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INTERFACE
         ${CMAKE_WORKSPACE_NAME}::algebra
         ${CMAKE_WORKSPACE_NAME}::hash
 
-        ${Boost_LIBRARIES})
+        Boost::container)
 
 target_include_directories(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INTERFACE
         "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
@@ -86,9 +82,8 @@ target_include_directories(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INTER
 
 cm_deploy(TARGETS ${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INCLUDE include NAMESPACE ${CMAKE_WORKSPACE_NAME}::)
 
-if (BUILD_TESTS)
-    add_subdirectory(test)
-endif ()
+include(CMTest)
+cm_add_test_subdirectory(test)
 
 if (BUILD_EXAMPLES)
     add_subdirectory(example)

diff --git a/libs/containers/example/CMakeLists.txt b/libs/containers/example/CMakeLists.txt
@@ -36,7 +36,7 @@ macro(define_containers_example example)
     target_link_libraries(${target_name} PRIVATE
             ${CMAKE_WORKSPACE_NAME}::algebra
             ${CMAKE_WORKSPACE_NAME}::hash
-            ${Boost_LIBRARIES})
+            Boost::container)
     set_target_properties(${target_name} PROPERTIES CXX_STANDARD 17)
 endmacro()
 

diff --git a/libs/containers/test/CMakeLists.txt b/libs/containers/test/CMakeLists.txt
@@ -25,16 +25,14 @@
 
 include(CMTest)
 
-if(NOT Boost_UNIT_TEST_FRAMEWORK_FOUND)
-    find_package(Boost REQUIRED COMPONENTS unit_test_framework)
-endif()
-
 cm_test_link_libraries(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME}
 
                        ${CMAKE_WORKSPACE_NAME}::algebra
                        ${CMAKE_WORKSPACE_NAME}::hash
 
-                       ${Boost_LIBRARIES})
+                       Boost::unit_test_framework
+                       Boost::random
+                   )
 
 macro(define_storage_test test)
     get_filename_component(test_name ${test} NAME)
@@ -46,17 +44,7 @@ macro(define_storage_test test)
         set(target_name ${PARENT_DIR}_${target_name})
     endwhile()
 
-    set(additional_args "")
-    if(ENABLE_JUNIT_TEST_OUTPUT)
-        set(TEST_RESULTS_DIR "${CMAKE_CURRENT_BINARY_DIR}/junit_results")
-        set(TEST_LOGS_DIR "${TEST_RESULTS_DIR}/logs")
-        file(MAKE_DIRECTORY ${TEST_LOGS_DIR})
-
-        set(additional_args "--log_format=JUNIT"
-                            "--log_sink=${TEST_LOGS_DIR}/${target_name}.xml")
-    endif()
-
-    cm_test(NAME ${target_name} SOURCES ${test}.cpp ARGS ${additional_args})
+    cm_test(NAME ${target_name} SOURCES ${test}.cpp)
 
     target_include_directories(${target_name} PRIVATE
                                "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
@@ -66,13 +54,6 @@ macro(define_storage_test test)
 
     set_target_properties(${target_name} PROPERTIES CXX_STANDARD 17)
 
-    get_target_property(target_type Boost::unit_test_framework TYPE)
-    if(target_type STREQUAL "SHARED_LIB")
-        target_compile_definitions(${target_name} PRIVATE BOOST_TEST_DYN_LINK)
-    elseif(target_type STREQUAL "STATIC_LIB")
-
-    endif()
-
      if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
         target_compile_options(${target_name} PRIVATE "-fconstexpr-steps=2147483647" "-ftemplate-backtrace-limit=0")
     elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")

diff --git a/libs/hash/CMakeLists.txt b/libs/hash/CMakeLists.txt
@@ -29,10 +29,6 @@ endif()
 
 cm_project(hash WORKSPACE_NAME ${CMAKE_WORKSPACE_NAME} LANGUAGES C CXX)
 
-if(NOT Boost_FOUND AND NOT CMAKE_CROSSCOMPILING)
-    find_package(Boost COMPONENTS REQUIRED container)
-endif()
-
 include(TargetArchitecture)
 include(TargetConfiguration)
 include(PlatformConfiguration)
@@ -241,7 +237,7 @@ target_link_libraries(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INTERFACE
                       ${CMAKE_WORKSPACE_NAME}::algebra
                       ${CMAKE_WORKSPACE_NAME}::block
 
-                      ${Boost_LIBRARIES})
+                      Boost::container)
 
 target_include_directories(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INTERFACE
                            "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"

diff --git a/libs/hash/test/CMakeLists.txt b/libs/hash/test/CMakeLists.txt
@@ -10,31 +10,17 @@ include(CMTest)
 
 cm_find_package(${CMAKE_WORKSPACE_NAME}_block)
 
-if(NOT Boost_UNIT_TEST_FRAMEWORK_FOUND)
-    find_package(Boost REQUIRED COMPONENTS unit_test_framework)
-endif()
-
 cm_test_link_libraries(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME}
                        ${${CURRENT_PROJECT_NAME}_INTERFACE_LIBRARIES}
 
                        ${CMAKE_WORKSPACE_NAME}::block
 
-                       ${Boost_LIBRARIES})
+                       Boost::unit_test_framework)
 
 macro(define_hash_test name)
     set(test_name "hash_${name}_test")
 
-    set(additional_args "")
-    if(ENABLE_JUNIT_TEST_OUTPUT)
-        set(TEST_RESULTS_DIR "${CMAKE_CURRENT_BINARY_DIR}/junit_results")
-        set(TEST_LOGS_DIR "${TEST_RESULTS_DIR}/logs")
-        file(MAKE_DIRECTORY ${TEST_LOGS_DIR})
-
-        set(additional_args "--log_format=JUNIT"
-                            "--log_sink=${TEST_LOGS_DIR}/${test_name}.xml")
-    endif()
-
-    cm_test(NAME ${test_name} SOURCES ${name}.cpp ARGS ${additional_args})
+    cm_test(NAME ${test_name} SOURCES ${name}.cpp)
 
     target_include_directories(${test_name} PRIVATE
                                "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
@@ -46,13 +32,6 @@ macro(define_hash_test name)
                           CXX_STANDARD 17
                           CXX_STANDARD_REQUIRED TRUE)
 
-    get_target_property(target_type Boost::unit_test_framework TYPE)
-    if(target_type STREQUAL "SHARED_LIB")
-        target_compile_definitions(${test_name} PRIVATE BOOST_TEST_DYN_LINK)
-    elseif(target_type STREQUAL "STATIC_LIB")
-
-    endif()
-
     if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
         target_compile_options(${test_name} PRIVATE "-fconstexpr-steps=2147483647")
     elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")

diff --git a/libs/kdf/CMakeLists.txt b/libs/kdf/CMakeLists.txt
@@ -33,10 +33,6 @@ cm_find_package(${CMAKE_WORKSPACE_NAME}_block)
 cm_find_package(${CMAKE_WORKSPACE_NAME}_hash)
 cm_find_package(${CMAKE_WORKSPACE_NAME}_mac)
 
-if(NOT Boost)
-    find_package(Boost REQUIRED)
-endif()
-
 list(APPEND ${CURRENT_PROJECT_NAME}_PUBLIC_HEADERS
      include/nil/crypto3/kdf/algorithm/derive.hpp
 

diff --git a/libs/kdf/test/CMakeLists.txt b/libs/kdf/test/CMakeLists.txt
@@ -11,16 +11,12 @@ include(CMTest)
 cm_find_package(${CMAKE_WORKSPACE_NAME}_block)
 cm_find_package(${CMAKE_WORKSPACE_NAME}_hash)
 
-if(NOT Boost_UNIT_TEST_FRAMEWORK_FOUND)
-    find_package(Boost REQUIRED COMPONENTS unit_test_framework)
-endif()
-
 cm_test_link_libraries(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME}
 
                        ${CMAKE_WORKSPACE_NAME}::block
                        ${CMAKE_WORKSPACE_NAME}::hash
 
-                       ${Boost_LIBRARIES})
+                       Boost::unit_test_framework)
 
 macro(define_kdf_test name)
     cm_test(NAME ${name}_test SOURCES ${name}.cpp)
@@ -33,12 +29,6 @@ macro(define_kdf_test name)
 
     set_target_properties(${name}_test PROPERTIES CXX_STANDARD 14)
 
-    get_target_property(target_type Boost::unit_test_framework TYPE)
-    if(target_type STREQUAL "SHARED_LIB")
-        target_compile_definitions(${name}_test PRIVATE BOOST_TEST_DYN_LINK)
-    elseif(target_type STREQUAL "STATIC_LIB")
-
-    endif()
 endmacro()
 
 set(TESTS_NAMES