[osrm] 16/22: Fix variant include directory in use-mapbox-variant-package.patch.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Fri Apr 29 22:44:15 UTC 2016


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository osrm.

commit 9e968ed463bf0925ee05ea732e159fe38a1a2006
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Apr 30 00:01:46 2016 +0200

    Fix variant include directory in use-mapbox-variant-package.patch.
---
 debian/patches/use-mapbox-variant-package.patch | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/patches/use-mapbox-variant-package.patch b/debian/patches/use-mapbox-variant-package.patch
index 94a93a1..4d3db99 100644
--- a/debian/patches/use-mapbox-variant-package.patch
+++ b/debian/patches/use-mapbox-variant-package.patch
@@ -4,7 +4,15 @@ Forwarded: not-needed
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -378,7 +378,7 @@ set_property(TARGET osrm-contract PROPER
+@@ -40,6 +40,7 @@ option(SANITIZER OFF)
+ include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}/include/)
+ include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/include/)
+ include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/third_party/)
++include_directories(SYSTEM /usr/include/mapbox/)
+ 
+ add_custom_target(FingerPrintConfigure ALL ${CMAKE_COMMAND}
+   "-DOUTPUT_DIR=${CMAKE_CURRENT_BINARY_DIR}"
+@@ -378,7 +379,7 @@ set_property(TARGET osrm-contract PROPER
  set_property(TARGET osrm-datastore PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE)
  set_property(TARGET osrm-routed PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE)
  
@@ -13,7 +21,7 @@ Forwarded: not-needed
  file(GLOB LibraryGlob include/osrm/*.hpp)
  file(GLOB ParametersGlob include/engine/api/*_parameters.hpp)
  set(EngineHeader include/engine/status.hpp include/engine/engine_config.hpp include/engine/hint.hpp include/engine/bearing.hpp include/engine/phantom_node.hpp)
-@@ -393,7 +393,7 @@ install(FILES ${ExtractorHeader} DESTINA
+@@ -393,7 +394,7 @@ install(FILES ${ExtractorHeader} DESTINA
  install(FILES ${ContractorHeader} DESTINATION include/osrm/contractor)
  install(FILES ${LibraryGlob} DESTINATION include/osrm)
  install(FILES ${ParametersGlob} DESTINATION include/osrm/engine/api)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osrm.git



More information about the Pkg-grass-devel mailing list