Don't expose all OSRM flags only the ones needed by external code

Elveris · Nov 19, 2016 · a764fd1 · a764fd1
1 parent 3687864
commit a764fd1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -240,6 +240,7 @@ if (ENABLE_COVERAGE)
 endif()
 if (ENABLE_SANITIZER)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
+  set(OSRM_CFLAGS "${OSRM_CFLAGS} -fsanitize=address")
 endif()
 
 # Configuring compilers
@@ -296,6 +297,7 @@ set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${LINKER_FLAGS}")
 # Activate C++1y
 if(NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y")
+  set(OSRM_CFLAGS "${OSRM_CFLAGS} -std=c++1y")
 endif()
 
 # Configuring other platform dependencies

diff --git a/cmake/pkgconfig.in b/cmake/pkgconfig.in
@@ -8,4 +8,4 @@ Version: v@OSRM_VERSION_MAJOR@.@OSRM_VERSION_MINOR@.@OSRM_VERSION_PATCH@
 Requires:
 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@
+Cflags: -I${includedir} -I${includedir}/osrm @OSRM_INCLUDE_PATHS_STRING@ @OSRM_DEFINES_STRING@ @OSRM_CFLAGS@
diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
@@ -33,4 +33,4 @@ find_package(LibOSRM REQUIRED)
 
 target_link_libraries(osrm-example ${LibOSRM_LIBRARIES} ${LibOSRM_DEPENDENT_LIBRARIES})
 include_directories(SYSTEM ${LibOSRM_INCLUDE_DIRS})
-set(CMAKE_CXX_FLAGS ${LibOSRM_CXXFLAGS})
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LibOSRM_CXXFLAGS}")