From f638b0478bf5587fcc41408817d578c4f1894b1a Mon Sep 17 00:00:00 2001 From: Siarhei Fedartsou Date: Tue, 1 Oct 2024 09:09:58 +0300 Subject: [PATCH] Migrate to Conan 2.x --- CMakeLists.txt | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a41221943..2c016e626 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -604,13 +604,15 @@ JOIN("-I${DEPENDENCIES_INCLUDE_DIRS}" " -I" PKGCONFIG_OSRM_INCLUDE_FLAGS) # Boost uses imported targets, we need to use a generator expression to extract # the link libraries to be written to the pkg-config file. # Conan & TBB define dependencies as CMake targets too, that's why we do the same for them. -foreach(engine_lib ${ENGINE_LIBRARIES}) - if("${engine_lib}" MATCHES "^boost.*" OR "${engine_lib}" MATCHES "^CONAN_LIB.*" OR "${engine_lib}" MATCHES "^TBB.*") - list(APPEND PKGCONFIG_DEPENDENT_LIBRARIES "$") - else() - list(APPEND PKGCONFIG_DEPENDENT_LIBRARIES "${engine_lib}") - endif() -endforeach(engine_lib) +# foreach(engine_lib ${ENGINE_LIBRARIES}) +# message(STATUS "Adding ${engine_lib} to pkg-config dependencies") +# # if("${engine_lib}" MATCHES "^boost.*" OR "${engine_lib}" MATCHES "^CONAN_LIB.*" OR "${engine_lib}" MATCHES "^TBB.*") +# # list(APPEND PKGCONFIG_DEPENDENT_LIBRARIES "$") +# # else() +# # list(APPEND PKGCONFIG_DEPENDENT_LIBRARIES "${engine_lib}") +# # endif() +# endforeach(engine_lib) +# #message(FATAL_ERROR "XXX") JOIN("${PKGCONFIG_DEPENDENT_LIBRARIES}" " " PKGCONFIG_OSRM_DEPENDENT_LIBRARIES) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/pkgconfig.in pkgconfig.configured @ONLY)