Skip to content

Commit 3be0c11

Browse files
wip
1 parent 8cb8e64 commit 3be0c11

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
@@ -653,13 +653,15 @@ list(APPEND DEPENDENCIES_INCLUDE_DIRS "${PKGCONFIG_INCLUDE_DIR}/osrm")
653653
JOIN("-I${DEPENDENCIES_INCLUDE_DIRS}" " -I" PKGCONFIG_OSRM_INCLUDE_FLAGS)
654654

655655

656-
foreach(engine_lib ${ENGINE_LIBRARIES})
657-
if("${engine_lib}" MATCHES "^boost.*" 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)
656+
if (NOT ENABLE_CONAN)
657+
foreach(engine_lib ${ENGINE_LIBRARIES})
658+
if("${engine_lib}" MATCHES "^boost.*" OR "${engine_lib}" MATCHES "^TBB.*")
659+
list(APPEND PKGCONFIG_DEPENDENT_LIBRARIES "$<TARGET_LINKER_FILE:${engine_lib}>")
660+
else()
661+
list(APPEND PKGCONFIG_DEPENDENT_LIBRARIES "${engine_lib}")
662+
endif()
663+
endforeach(engine_lib)
664+
endif()
663665

664666
JOIN("${PKGCONFIG_DEPENDENT_LIBRARIES}" " " PKGCONFIG_OSRM_DEPENDENT_LIBRARIES)
665667

0 commit comments

Comments
 (0)