don't use cm_find_package

NilFoundation · May 20, 2024 · ee7874c · ee7874c
1 parent 9ba0510
commit ee7874c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 12 deletions.
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -26,7 +26,7 @@ jobs:
     name: Linux Reusable Crypto3 Testing
     needs:
       - handle-syncwith
-    uses: NilFoundation/crypto3/.github/workflows/reusable-submodule-testing-linux.yml@ede1d6b903078a0aa48a6864ba465b66af4fda8b
+    uses: NilFoundation/crypto3/.github/workflows/reusable-submodule-testing-linux.yml@1bd56b12f410f3f1a4891076705a9261a6b1efaa
 
     secrets: inherit
     with:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -27,16 +27,8 @@ endif()
 
 cm_project(block WORKSPACE_NAME ${CMAKE_WORKSPACE_NAME} LANGUAGES C CXX)
 
-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()
-
 if((NOT Boost_CONTAINER_FOUND OR NOT Boost_FOUND) AND NOT CMAKE_CROSSCOMPILING)
-    cm_find_package(Boost COMPONENTS REQUIRED container)
+    find_package(Boost COMPONENTS REQUIRED container)
 endif()
 
 include(TargetArchitecture)

diff --git a/cmake/modules b/cmake/modules
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -7,7 +7,7 @@
 #---------------------------------------------------------------------------#
 
 if(NOT Boost_UNIT_TEST_FRAMEWORK_FOUND)
-    cm_find_package(Boost REQUIRED COMPONENTS unit_test_framework)
+    find_package(Boost REQUIRED COMPONENTS unit_test_framework)
 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