From fa1a0a13251f1b905e3a10419fc23c2a4c918f06 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Thu, 10 Nov 2016 13:54:44 -0800 Subject: [PATCH] Ensure pkg-config reports OSRM_LIB_LINKER_FLAGS --- CMakeLists.txt | 1 + cmake/pkgconfig.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d1c43847..9ddf4fb7a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -383,6 +383,7 @@ if(ENABLE_MASON) elseif(APPLE) set(LINKER_FLAGS "-Wl,-rpath, -Wl,${libpath}") endif() + set(OSRM_LIB_LINKER_FLAGS "${OSRM_LIB_LINKER_FLAGS} ${LINKER_FLAGS}") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LINKER_FLAGS}") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${LINKER_FLAGS}") set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${LINKER_FLAGS}") diff --git a/cmake/pkgconfig.in b/cmake/pkgconfig.in index 06ba3aff7..779e5067f 100644 --- a/cmake/pkgconfig.in +++ b/cmake/pkgconfig.in @@ -6,6 +6,6 @@ Name: libOSRM Description: Project OSRM library Version: v@OSRM_VERSION_MAJOR@.@OSRM_VERSION_MINOR@.@OSRM_VERSION_PATCH@ Requires: -Libs: -L${libdir} -losrm +Libs: -L${libdir} -losrm @OSRM_LIB_LINKER_FLAGS@ Libs.private: @ENGINE_LIBRARY_LISTING@ Cflags: -I${includedir} -I${includedir}/osrm @OSRM_INCLUDE_PATHS_STRING@ @OSRM_DEFINES_STRING@ @CMAKE_CXX_FLAGS@