Skip to content

Commit ae0913d

Browse files
wip
1 parent 6a8ff78 commit ae0913d

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

CMakeLists.txt

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -651,14 +651,16 @@ JOIN("-I${DEPENDENCIES_INCLUDE_DIRS}" " -I" PKGCONFIG_OSRM_INCLUDE_FLAGS)
651651
# # Boost uses imported targets, we need to use a generator expression to extract
652652
# # the link libraries to be written to the pkg-config file.
653653
# # Conan & TBB define dependencies as CMake targets too, that's why we do the same for them.
654-
foreach(engine_lib ${ENGINE_LIBRARIES})
655-
message(STATUS "Adding ${engine_lib} to pkg-config dependencies")
656-
if("${engine_lib}" MATCHES "^boost.*" OR "${engine_lib}" MATCHES "^CONAN_LIB.*" OR "${engine_lib}" MATCHES "^TBB.*")
657-
list(APPEND PKGCONFIG_DEPENDENT_LIBRARIES "$<TARGET_LINKER_FILE:${engine_lib}>")
658-
else()
659-
list(APPEND PKGCONFIG_DEPENDENT_LIBRARIES "${engine_lib}")
660-
endif()
661-
endforeach(engine_lib)
654+
if (NOT ENABLE_CONAN)
655+
foreach(engine_lib ${ENGINE_LIBRARIES})
656+
message(STATUS "Adding ${engine_lib} to pkg-config dependencies")
657+
if("${engine_lib}" MATCHES "^boost.*" OR "${engine_lib}" MATCHES "^CONAN_LIB.*" OR "${engine_lib}" MATCHES "^TBB.*")
658+
list(APPEND PKGCONFIG_DEPENDENT_LIBRARIES "$<TARGET_LINKER_FILE:${engine_lib}>")
659+
else()
660+
list(APPEND PKGCONFIG_DEPENDENT_LIBRARIES "${engine_lib}")
661+
endif()
662+
endforeach(engine_lib)
663+
endif()
662664
JOIN("${PKGCONFIG_DEPENDENT_LIBRARIES}" " " PKGCONFIG_OSRM_DEPENDENT_LIBRARIES)
663665

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

0 commit comments

Comments
 (0)