wip

.github/workflows/osrm-backend.yml

@@ -568,7 +568,7 @@ jobs:
         fi
         popd
     - name: Build example
-      if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY != 'ON' }}
+      if: ${{ matrix.NODE_PACKAGE_TESTS_ONLY != 'ON' && matrix.ENABLE_CONAN != 'ON' }}
       run: |
         mkdir example/build && pushd example/build
         cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE}

CMakeLists.txt

@@ -332,7 +332,6 @@ find_package(Lua 5.2 REQUIRED)
 if (ENABLE_CONAN)
   add_dependency_includes(${Boost_INCLUDE_DIRS})
   set(BOOST_LIBRARIES ${Boost_LIBRARIES})
-
   add_dependency_includes(${TBB_INCLUDE_DIR})
   set(TBB_LIBRARIES ${TBB_LIBRARIES})
 
@@ -626,20 +625,15 @@ list(APPEND DEPENDENCIES_INCLUDE_DIRS "${PKGCONFIG_INCLUDE_DIR}")
 list(APPEND DEPENDENCIES_INCLUDE_DIRS "${PKGCONFIG_INCLUDE_DIR}/osrm")
 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.
+# # 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})
-  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 "$<TARGET_LINKER_FILE:${engine_lib}>")
-  # else()
-  #   list(APPEND PKGCONFIG_DEPENDENT_LIBRARIES "${engine_lib}")
-  # endif()
-  list(APPEND PKGCONFIG_DEPENDENT_LIBRARIES "${engine_lib}")
+  message(STATUS "Adding ${engine_lib} to pkg-config dependencies ")
+  list(APPEND PKGCONFIG_DEPENDENT_LIBRARIES "$<TARGET_LINKER_FILE:${engine_lib}>")
 endforeach(engine_lib)
-# #message(FATAL_ERROR "XXX")
-JOIN("${PKGCONFIG_DEPENDENT_LIBRARIES}" " " PKGCONFIG_OSRM_DEPENDENT_LIBRARIES)
+#message(FATAL_ERROR "XXX")
+# JOIN("${PKGCONFIG_DEPENDENT_LIBRARIES}" " " PKGCONFIG_OSRM_DEPENDENT_LIBRARIES)
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/pkgconfig.in pkgconfig.configured @ONLY)
 file(GENERATE