cleanup cmake

NilFoundation · May 21, 2024 · 0e77dcf · 0e77dcf
1 parent 3304952
commit 0e77dcf
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 21 deletions.
diff --git a/.github/workflows/publish-results.yml b/.github/workflows/publish-results.yml
@@ -10,4 +10,4 @@ on:
 jobs:
   call-reusable-workflow:
     name: Call Reusable Testing Callback Workflow
-    uses: NilFoundation/ci-cd/.github/workflows/[email protected].0
+    uses: NilFoundation/ci-cd/.github/workflows/[email protected].1
diff --git a/.github/workflows/pull-request-action.yml b/.github/workflows/pull-request-action.yml
@@ -11,7 +11,7 @@ on:
 jobs:
   handle-syncwith:
     name: Call Reusable SyncWith Handler
-    uses: NilFoundation/ci-cd/.github/workflows/[email protected].0
+    uses: NilFoundation/ci-cd/.github/workflows/[email protected].1
     with:
       ci-cd-ref: 'v1.2.0'
     secrets: inherit
@@ -20,7 +20,7 @@ jobs:
     name: Linux Reusable Crypto3 Testing
     needs:
       - handle-syncwith
-    uses: NilFoundation/ci-cd/.github/workflows/[email protected].0
+    uses: NilFoundation/ci-cd/.github/workflows/[email protected].1
 
     secrets: inherit
     with:
@@ -33,7 +33,7 @@ jobs:
 #    name: Mac Reusable Crypto3 Testing
 #    needs:
 #      - handle-syncwith
-#    uses: NilFoundation/ci-cd/.github/workflows/[email protected].0
+#    uses: NilFoundation/ci-cd/.github/workflows/[email protected].1
 #
 #    secrets: inherit
 #    with:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,24 +14,13 @@ include(CMDeploy)
 include(CMSetupVersion)
 
 cm_workspace(marshalling)
-
-macro(cm_find_package NAME)
-    if(NOT "${NAME}" MATCHES "^${CMAKE_WORKSPACE_NAME}_.*$" AND NOT "${NAME}" STREQUAL CM)
-        find_package(${ARGV})
-    else()
-        set(${ARGV0}_FOUND ON CACHE BOOL "")
-    endif()
-endmacro()
-
 cm_project(crypto3_zk WORKSPACE_NAME ${CMAKE_WORKSPACE_NAME} LANGUAGES C CXX)
 
-cm_find_package(CM)
 include(CMDeploy)
 include(FindPkgConfig)
 
 include(CMSetupVersion)
 
-option(BUILD_TESTS "Build unit tests" TRUE)
 option(BUILD_WITH_NO_WARNINGS "Build threading warnings as errors" FALSE)
 
 cm_setup_version(VERSION 0.1.0 PREFIX ${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME})
@@ -64,9 +53,8 @@ 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/cmake/modules b/cmake/modules
diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
@@ -12,7 +12,7 @@ include(CMDeploy)
 include(CMSetupVersion)
 
 
-    cm_find_package(Boost REQUIRED COMPONENTS filesystem log log_setup program_options thread system)
+    find_package(Boost REQUIRED COMPONENTS filesystem log log_setup program_options thread system)
 
 
 macro(define_marshalling_example name)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -10,7 +10,7 @@
 include(CMTest)
 
 if(NOT Boost_UNIT_TEST_FRAMEWORK_FOUND)
-    cm_find_package(Boost REQUIRED COMPONENTS unit_test_framework filesystem log log_setup program_options thread system)
+    find_package(Boost REQUIRED COMPONENTS unit_test_framework filesystem log log_setup program_options thread system)
 endif()
 
 cm_test_link_libraries(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME}
+20 −8		share/modules/cmake/CMConfig.cmake
+6 −1		share/modules/cmake/CMDeploy.cmake
+17 −10		share/modules/cmake/CMExport.cmake
+7 −4		share/modules/cmake/CMInstallTargets.cmake
+27 −23		share/modules/cmake/CMPkgConfig.cmake
+17 −13		share/modules/cmake/CMTest.cmake
+5 −0		test/CMakeLists.txt