From d7ab7c70cdf6c8fa56d85d5834a86667a5f17da0 Mon Sep 17 00:00:00 2001
From: MALASHKIN Andrei <andrei.malashkin-ext@hexagon.com>
Date: Mon, 20 May 2024 10:10:05 +0200
Subject: [PATCH] cleanup cmake; update CI

---
 .github/workflows/pull-request.yml |  2 +-
 CMakeLists.txt                     | 14 +-------------
 cmake/modules                      |  2 +-
 test/CMakeLists.txt                |  2 +-
 test/bench_test/CMakeLists.txt     |  2 +-
 5 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 7e6dbfa4..09ace3cc 100644
--- 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@f945b13ac30e102068e324dbfca6962c0f33ffaf
+    uses: NilFoundation/crypto3/.github/workflows/reusable-submodule-testing-linux.yml@1bd56b12f410f3f1a4891076705a9261a6b1efaa
 
     secrets: inherit
     with:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e757bda5..ffd3c528 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,26 +26,14 @@ if(NOT CMAKE_WORKSPACE_NAME OR NOT ("${CMAKE_WORKSPACE_NAME}" STREQUAL "crypto3"
     cm_workspace(crypto3)
 endif()
 
-macro(cm_find_package NAME)
-    foreach(ITERATOR ${CMAKE_WORKSPACE_LIST})
-        if(NOT "${NAME}" MATCHES "^${ITERATOR}_.*$" AND NOT "${NAME}" STREQUAL CM)
-            find_package(${ARGV})
-        else()
-            set(${ARGV0}_FOUND ON CACHE BOOL "")
-        endif()
-    endforeach()
-endmacro()
-
 cm_project(algebra WORKSPACE_NAME ${CMAKE_WORKSPACE_NAME} LANGUAGES ASM C CXX)
 
 if(NOT Boost_FOUND AND NOT CMAKE_CROSSCOMPILING)
-    cm_find_package(Boost)
+    find_package(Boost)
 endif()
 
-cm_find_package(CM)
 include(CMDeploy)
 
-option(BUILD_TESTS "Build unit tests" FALSE)
 option(BUILD_BENCH_TESTS "Build performance benchmark tests" FALSE)
 option(BUILD_EXAMPLES "Build examples" FALSE)
 
diff --git a/cmake/modules b/cmake/modules
index 5e6b354e..57639741 160000
--- a/cmake/modules
+++ b/cmake/modules
@@ -1 +1 @@
-Subproject commit 5e6b354eaa69f6a275992e08220e925c34ba0a19
+Subproject commit 57639741ecf018835deb97a04db2200241d7fbd3
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 72743399..c871e0e2 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -9,7 +9,7 @@
 include(CMTest)
 
 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}
diff --git a/test/bench_test/CMakeLists.txt b/test/bench_test/CMakeLists.txt
index 085d7214..bf9c23ae 100644
--- a/test/bench_test/CMakeLists.txt
+++ b/test/bench_test/CMakeLists.txt
@@ -9,7 +9,7 @@
 include(CMTest)
 
 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()
 
 add_custom_target(algebra_runtime_bench_tests)