Migrate to Conan 2.x
This commit is contained in:
parent
b7f0a1f482
commit
f638b0478b
@ -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
|
# Boost uses imported targets, we need to use a generator expression to extract
|
||||||
# the link libraries to be written to the pkg-config file.
|
# 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.
|
# Conan & TBB define dependencies as CMake targets too, that's why we do the same for them.
|
||||||
foreach(engine_lib ${ENGINE_LIBRARIES})
|
# foreach(engine_lib ${ENGINE_LIBRARIES})
|
||||||
if("${engine_lib}" MATCHES "^boost.*" OR "${engine_lib}" MATCHES "^CONAN_LIB.*" OR "${engine_lib}" MATCHES "^TBB.*")
|
# message(STATUS "Adding ${engine_lib} to pkg-config dependencies")
|
||||||
list(APPEND PKGCONFIG_DEPENDENT_LIBRARIES "$<TARGET_LINKER_FILE:${engine_lib}>")
|
# # if("${engine_lib}" MATCHES "^boost.*" OR "${engine_lib}" MATCHES "^CONAN_LIB.*" OR "${engine_lib}" MATCHES "^TBB.*")
|
||||||
else()
|
# # list(APPEND PKGCONFIG_DEPENDENT_LIBRARIES "$<TARGET_LINKER_FILE:${engine_lib}>")
|
||||||
list(APPEND PKGCONFIG_DEPENDENT_LIBRARIES "${engine_lib}")
|
# # else()
|
||||||
endif()
|
# # list(APPEND PKGCONFIG_DEPENDENT_LIBRARIES "${engine_lib}")
|
||||||
endforeach(engine_lib)
|
# # endif()
|
||||||
|
# endforeach(engine_lib)
|
||||||
|
# #message(FATAL_ERROR "XXX")
|
||||||
JOIN("${PKGCONFIG_DEPENDENT_LIBRARIES}" " " PKGCONFIG_OSRM_DEPENDENT_LIBRARIES)
|
JOIN("${PKGCONFIG_DEPENDENT_LIBRARIES}" " " PKGCONFIG_OSRM_DEPENDENT_LIBRARIES)
|
||||||
|
|
||||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/pkgconfig.in pkgconfig.configured @ONLY)
|
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/pkgconfig.in pkgconfig.configured @ONLY)
|
||||||
|
Loading…
Reference in New Issue
Block a user