From a8f11981e37b09b4724fbb6ed838d7d4337af2c3 Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Tue, 15 Dec 2015 21:42:32 +0100 Subject: [PATCH] Include tbb in libosrm.pc --- CMakeLists.txt | 13 +++++++++++-- cmake/pkgconfig.in | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c68188a95..965e16448 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,8 +8,8 @@ endif() project(OSRM C CXX) set(OSRM_VERSION_MAJOR 4) -set(OSRM_VERSION_MINOR 8) -set(OSRM_VERSION_PATCH 1) +set(OSRM_VERSION_MINOR 9) +set(OSRM_VERSION_PATCH 0) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) include(CheckCXXCompilerFlag) @@ -393,6 +393,7 @@ install(TARGETS osrm-prepare DESTINATION bin) install(TARGETS osrm-datastore DESTINATION bin) install(TARGETS osrm-routed DESTINATION bin) install(TARGETS OSRM DESTINATION lib) + list(GET Boost_LIBRARIES 1 BOOST_LIBRARY_FIRST) get_filename_component(BOOST_LIBRARY_LISTING "${BOOST_LIBRARY_FIRST}" PATH) set(BOOST_LIBRARY_LISTING "-L${BOOST_LIBRARY_LISTING}") @@ -401,6 +402,14 @@ foreach(lib ${Boost_LIBRARIES}) string(REPLACE "lib" "" BOOST_LIBRARY_NAME ${BOOST_LIBRARY_NAME}) set(BOOST_LIBRARY_LISTING "${BOOST_LIBRARY_LISTING} -l${BOOST_LIBRARY_NAME}") endforeach() +list(GET TBB_LIBRARIES 1 TBB_LIBRARY_FIRST) +get_filename_component(TBB_LIBRARY_LISTING "${TBB_LIBRARY_FIRST}" PATH) +set(TBB_LIBRARY_LISTING "-L${TBB_LIBRARY_LISTING}") +foreach(lib ${TBB_LIBRARIES}) + get_filename_component(TBB_LIBRARY_NAME "${lib}" NAME_WE) + string(REPLACE "lib" "" TBB_LIBRARY_NAME ${TBB_LIBRARY_NAME}) + set(TBB_LIBRARY_LISTING "${TBB_LIBRARY_LISTING} -l${TBB_LIBRARY_NAME}") +endforeach() configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/pkgconfig.in libosrm.pc @ONLY) install(FILES ${PROJECT_BINARY_DIR}/libosrm.pc DESTINATION lib/pkgconfig) diff --git a/cmake/pkgconfig.in b/cmake/pkgconfig.in index 89969ab00..16263bfe0 100644 --- a/cmake/pkgconfig.in +++ b/cmake/pkgconfig.in @@ -7,5 +7,5 @@ Description: Project OSRM library Version: v@OSRM_VERSION_MAJOR@.@OSRM_VERSION_MINOR@.@OSRM_VERSION_PATCH@ Requires: Libs: -L${libdir} -lOSRM -Libs.private: @BOOST_LIBRARY_LISTING@ +Libs.private: @BOOST_LIBRARY_LISTING@ @TBB_LIBRARY_LISTING@ Cflags: -I${includedir}