From 29ba28afe12f5238f6fe9dfe40f9db58dfcb9653 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Thu, 6 Jun 2024 22:53:20 +0300 Subject: [PATCH 01/10] Try to adapt Threads --- cmake/install-config.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/install-config.cmake.in b/cmake/install-config.cmake.in index 1389cc4d1..d1b2b1030 100644 --- a/cmake/install-config.cmake.in +++ b/cmake/install-config.cmake.in @@ -1,6 +1,6 @@ @PACKAGE_INIT@ -find_package(Threads REQUIRED) +find_dependency(Threads) include("${CMAKE_CURRENT_LIST_DIR}/RPPTargets.cmake") From e71ccb1903ed6fd6935588bcde86a0b02e3e2b3b Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Thu, 6 Jun 2024 23:09:40 +0300 Subject: [PATCH 02/10] Update dependencies.cmake --- cmake/dependencies.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake index 697745e08..bf1788db2 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake @@ -1,4 +1,4 @@ -find_package(Threads REQUIRED) +find_dependency(Threads) macro(rpp_handle_3rdparty TARGET_NAME) get_target_property(TARGET_TYPE ${TARGET_NAME} TYPE) From 5d8a39395736c979ba8d159641bd0887a99fbb2d Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Thu, 6 Jun 2024 23:12:31 +0300 Subject: [PATCH 03/10] Update dependencies.cmake --- cmake/dependencies.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake index bf1788db2..99e226759 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake @@ -1,4 +1,6 @@ -find_dependency(Threads) + +include(CMakeFindDependencyMacro) +find_package(Threads) macro(rpp_handle_3rdparty TARGET_NAME) get_target_property(TARGET_TYPE ${TARGET_NAME} TYPE) From 44af112d8a5318ded1c34a67f3ec07b6577464d2 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Thu, 6 Jun 2024 23:20:53 +0300 Subject: [PATCH 04/10] fix --- cmake/dependencies.cmake | 2 +- cmake/install-config.cmake.in | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake index 99e226759..f5986751b 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake @@ -1,5 +1,5 @@ -include(CMakeFindDependencyMacro) +message("TEST 1") find_package(Threads) macro(rpp_handle_3rdparty TARGET_NAME) diff --git a/cmake/install-config.cmake.in b/cmake/install-config.cmake.in index d1b2b1030..b13e1fb5c 100644 --- a/cmake/install-config.cmake.in +++ b/cmake/install-config.cmake.in @@ -1,6 +1,7 @@ @PACKAGE_INIT@ -find_dependency(Threads) +message("TEST 2") +find_package(Threads) include("${CMAKE_CURRENT_LIST_DIR}/RPPTargets.cmake") From 779ddb36b9b9eaac3988ba51ee5344630527a714 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Thu, 6 Jun 2024 23:22:26 +0300 Subject: [PATCH 05/10] test --- cmake/dependencies.cmake | 3 +-- cmake/install-config.cmake.in | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake index f5986751b..b1a50d7b7 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake @@ -1,6 +1,5 @@ -message("TEST 1") -find_package(Threads) +find_package(TEST_1) macro(rpp_handle_3rdparty TARGET_NAME) get_target_property(TARGET_TYPE ${TARGET_NAME} TYPE) diff --git a/cmake/install-config.cmake.in b/cmake/install-config.cmake.in index b13e1fb5c..9071e345b 100644 --- a/cmake/install-config.cmake.in +++ b/cmake/install-config.cmake.in @@ -1,7 +1,6 @@ @PACKAGE_INIT@ -message("TEST 2") -find_package(Threads) +find_package(TEST_2 REQUIRED) include("${CMAKE_CURRENT_LIST_DIR}/RPPTargets.cmake") From d82c056038701b8565ffdc3aa23bd0e8ffa59686 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Thu, 6 Jun 2024 23:24:38 +0300 Subject: [PATCH 06/10] test --- cmake/dependencies.cmake | 2 +- cmake/install-config.cmake.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake index b1a50d7b7..1eadf8367 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake @@ -1,5 +1,5 @@ -find_package(TEST_1) +# find_package(Threads) macro(rpp_handle_3rdparty TARGET_NAME) get_target_property(TARGET_TYPE ${TARGET_NAME} TYPE) diff --git a/cmake/install-config.cmake.in b/cmake/install-config.cmake.in index 9071e345b..1389cc4d1 100644 --- a/cmake/install-config.cmake.in +++ b/cmake/install-config.cmake.in @@ -1,6 +1,6 @@ @PACKAGE_INIT@ -find_package(TEST_2 REQUIRED) +find_package(Threads REQUIRED) include("${CMAKE_CURRENT_LIST_DIR}/RPPTargets.cmake") From 01c6a261dc07623002ee8b02060154fd7749be3f Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Thu, 6 Jun 2024 23:29:17 +0300 Subject: [PATCH 07/10] revert --- cmake/dependencies.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake index 1eadf8367..d4854c6a4 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake @@ -1,5 +1,5 @@ -# find_package(Threads) +find_package(Threads) macro(rpp_handle_3rdparty TARGET_NAME) get_target_property(TARGET_TYPE ${TARGET_NAME} TYPE) From 7581c88a98533dce26b6ecb4a47130468774a4e6 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Thu, 6 Jun 2024 23:32:36 +0300 Subject: [PATCH 08/10] test --- cmake/dependencies.cmake | 1 + cmake/install-config.cmake.in | 1 + 2 files changed, 2 insertions(+) diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake index d4854c6a4..f5986751b 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake @@ -1,4 +1,5 @@ +message("TEST 1") find_package(Threads) macro(rpp_handle_3rdparty TARGET_NAME) diff --git a/cmake/install-config.cmake.in b/cmake/install-config.cmake.in index 1389cc4d1..1a2df1e13 100644 --- a/cmake/install-config.cmake.in +++ b/cmake/install-config.cmake.in @@ -1,5 +1,6 @@ @PACKAGE_INIT@ +message("TEST 2") find_package(Threads REQUIRED) include("${CMAKE_CURRENT_LIST_DIR}/RPPTargets.cmake") From bd01f8b151c415deb0f55707a8250d99016b29c3 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Thu, 6 Jun 2024 23:35:54 +0300 Subject: [PATCH 09/10] one more --- cmake/dependencies.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake index f5986751b..3be161bb7 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake @@ -1,4 +1,4 @@ - +set(THREADS_PREFER_PTHREAD_FLAG ON) message("TEST 1") find_package(Threads) From 2dbc43f233adf8210b7d70debf8fc7224bf0b090 Mon Sep 17 00:00:00 2001 From: Aleksey Loginov Date: Fri, 7 Jun 2024 00:05:41 +0300 Subject: [PATCH 10/10] finalize --- cmake/dependencies.cmake | 2 -- cmake/install-config.cmake.in | 1 - 2 files changed, 3 deletions(-) diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake index 3be161bb7..d343ba044 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake @@ -1,5 +1,3 @@ -set(THREADS_PREFER_PTHREAD_FLAG ON) -message("TEST 1") find_package(Threads) macro(rpp_handle_3rdparty TARGET_NAME) diff --git a/cmake/install-config.cmake.in b/cmake/install-config.cmake.in index 1a2df1e13..1389cc4d1 100644 --- a/cmake/install-config.cmake.in +++ b/cmake/install-config.cmake.in @@ -1,6 +1,5 @@ @PACKAGE_INIT@ -message("TEST 2") find_package(Threads REQUIRED) include("${CMAKE_CURRENT_LIST_DIR}/RPPTargets.cmake")