From de409e02de2bd7dcdcdfd3b8906eaeb28d22090b Mon Sep 17 00:00:00 2001 From: Arseniy Obolenskiy Date: Sun, 20 Jul 2025 01:58:37 +0200 Subject: [PATCH 1/3] simplify dependency includes --- CMakeLists.txt | 12 ++++++------ modules/CMakeLists.txt | 11 +++-------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1a0982a27..37584c9c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,16 +29,16 @@ message( STATUS "PPC step: First configures" ) include(cmake/configure.cmake) include(cmake/modes.cmake) include(cmake/sanitizers.cmake) -include(cmake/json.cmake) -include(cmake/libenvpp.cmake) -include(cmake/stb.cmake) +foreach(dep json libenvpp stb) + include(cmake/${dep}.cmake) +endforeach() ################# Parallel programming technologies ################# message( STATUS "PPC step: Setup parallel programming technologies" ) -include(cmake/mpi.cmake) -include(cmake/openmp.cmake) -include(cmake/onetbb.cmake) +foreach(dep mpi openmp onetbb) + include(cmake/${dep}.cmake) +endforeach() ######################### External projects ######################### diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index a867e59fd..f5559368f 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -27,14 +27,9 @@ target_include_directories( ${exec_func_lib} PUBLIC ${CMAKE_SOURCE_DIR}/3rdparty ${CMAKE_SOURCE_DIR}/modules ${CMAKE_SOURCE_DIR}/tasks) -ppc_link_envpp(${exec_func_lib}) -ppc_link_json(${exec_func_lib}) -ppc_link_gtest(${exec_func_lib}) -ppc_link_threads(${exec_func_lib}) -ppc_link_openmp(${exec_func_lib}) -ppc_link_tbb(${exec_func_lib}) -ppc_link_mpi(${exec_func_lib}) -ppc_link_stb(${exec_func_lib}) +foreach(link envpp json gtest threads openmp tbb mpi stb) + ppc_link_${link}(${exec_func_lib}) +endforeach() add_executable(${exec_func_tests} ${FUNC_TESTS_SOURCE_FILES}) From 44438fd965c891a455f3cc3382998737119db89f Mon Sep 17 00:00:00 2001 From: Arseniy Obolenskiy Date: Sun, 20 Jul 2025 02:10:57 +0200 Subject: [PATCH 2/3] Fix dynamic link macro call --- modules/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index f5559368f..3a76a801a 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -28,7 +28,7 @@ target_include_directories( ${CMAKE_SOURCE_DIR}/modules ${CMAKE_SOURCE_DIR}/tasks) foreach(link envpp json gtest threads openmp tbb mpi stb) - ppc_link_${link}(${exec_func_lib}) + cmake_language(CALL "ppc_link_${link}" ${exec_func_lib}) endforeach() add_executable(${exec_func_tests} ${FUNC_TESTS_SOURCE_FILES}) From aef2fcb0683689f34078ff870bb0f22c4ef5dc5c Mon Sep 17 00:00:00 2001 From: Arseniy Obolenskiy Date: Sun, 20 Jul 2025 02:12:30 +0200 Subject: [PATCH 3/3] cmake format --- modules/CMakeLists.txt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index 3a76a801a..d9b5057e3 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -27,7 +27,16 @@ target_include_directories( ${exec_func_lib} PUBLIC ${CMAKE_SOURCE_DIR}/3rdparty ${CMAKE_SOURCE_DIR}/modules ${CMAKE_SOURCE_DIR}/tasks) -foreach(link envpp json gtest threads openmp tbb mpi stb) +foreach( + link + envpp + json + gtest + threads + openmp + tbb + mpi + stb) cmake_language(CALL "ppc_link_${link}" ${exec_func_lib}) endforeach()