wip

.github/workflows/osrm-backend.yml

@@ -166,7 +166,7 @@ jobs:
           docker stop osrm-container
 
   build-test-publish:
-    #needs: format-taginfo-docs
+    needs: format-taginfo-docs
     strategy:
       matrix:
         include:
@@ -519,13 +519,12 @@ jobs:
         echo "Using ${JOBS} jobs"
         pushd ${OSRM_BUILD_DIR}
 
-        python3 -m venv .venv
-
-        source .venv/bin/activate
-
-        python3 -m pip install conan==2.7.1
-
-        conan profile detect --force
+        if [[ "${ENABLE_CONAN}" == "ON" ]]; then
+          python3 -m venv .venv
+          source .venv/bin/activate
+          python3 -m pip install conan==2.7.1
+          conan profile detect --force
+        fi
 
         ccache --zero-stats
         cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
@@ -566,9 +565,11 @@ jobs:
       run: |
         make -C test/data benchmark
 
-        # # macOS SIP strips the linker path. Reset this inside the running shell
-        # export LD_LIBRARY_PATH=${{ env.LD_LIBRARY_PATH }}
-        # ./example/build/osrm-example test/data/mld/monaco.osrm
+        # macOS SIP strips the linker path. Reset this inside the running shell
+        if [[ "${ENABLE_CONAN}" == "OFF" ]]; then
+          export LD_LIBRARY_PATH=${{ env.LD_LIBRARY_PATH }}
+          ./example/build/osrm-example test/data/mld/monaco.osrm
+        fi
 
         # All tests assume to be run from the build directory
         pushd ${OSRM_BUILD_DIR}

CMakeLists.txt

@@ -652,19 +652,11 @@ 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.
-if (NOT ENABLE_CONAN)
-  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()
-  endforeach(engine_lib)
-endif()
+
+foreach(engine_lib ${ENGINE_LIBRARIES})
+    list(APPEND PKGCONFIG_DEPENDENT_LIBRARIES "${engine_lib}")
+endforeach(engine_lib)
+
 JOIN("${PKGCONFIG_DEPENDENT_LIBRARIES}" " " PKGCONFIG_OSRM_DEPENDENT_LIBRARIES)
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/pkgconfig.in pkgconfig.configured @ONLY)