Skip to content

Commit f638b04

Browse files
Migrate to Conan 2.x
1 parent b7f0a1f commit f638b04

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

CMakeLists.txt

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -604,13 +604,15 @@ JOIN("-I${DEPENDENCIES_INCLUDE_DIRS}" " -I" PKGCONFIG_OSRM_INCLUDE_FLAGS)
604604
# Boost uses imported targets, we need to use a generator expression to extract
605605
# the link libraries to be written to the pkg-config file.
606606
# Conan & TBB define dependencies as CMake targets too, that's why we do the same for them.
607-
foreach(engine_lib ${ENGINE_LIBRARIES})
608-
if("${engine_lib}" MATCHES "^boost.*" OR "${engine_lib}" MATCHES "^CONAN_LIB.*" OR "${engine_lib}" MATCHES "^TBB.*")
609-
list(APPEND PKGCONFIG_DEPENDENT_LIBRARIES "$<TARGET_LINKER_FILE:${engine_lib}>")
610-
else()
611-
list(APPEND PKGCONFIG_DEPENDENT_LIBRARIES "${engine_lib}")
612-
endif()
613-
endforeach(engine_lib)
607+
# foreach(engine_lib ${ENGINE_LIBRARIES})
608+
# message(STATUS "Adding ${engine_lib} to pkg-config dependencies")
609+
# # if("${engine_lib}" MATCHES "^boost.*" OR "${engine_lib}" MATCHES "^CONAN_LIB.*" OR "${engine_lib}" MATCHES "^TBB.*")
610+
# # list(APPEND PKGCONFIG_DEPENDENT_LIBRARIES "$<TARGET_LINKER_FILE:${engine_lib}>")
611+
# # else()
612+
# # list(APPEND PKGCONFIG_DEPENDENT_LIBRARIES "${engine_lib}")
613+
# # endif()
614+
# endforeach(engine_lib)
615+
# #message(FATAL_ERROR "XXX")
614616
JOIN("${PKGCONFIG_DEPENDENT_LIBRARIES}" " " PKGCONFIG_OSRM_DEPENDENT_LIBRARIES)
615617

616618
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/pkgconfig.in pkgconfig.configured @ONLY)

0 commit comments

Comments
 (0)