From 928a6f0c7ddf2d9e492f4e93c6f5550f23ff704b Mon Sep 17 00:00:00 2001 From: Daniel Patterson Date: Thu, 1 Dec 2016 16:59:29 -0800 Subject: [PATCH] Variant got re-packaged, need to update search paths. (#3392) --- CMakeLists.txt | 6 +++--- include/server/service/base_service.hpp | 2 +- include/util/json_container.hpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 649634624..e85a16613 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -92,7 +92,7 @@ endif() 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 ${CMAKE_CURRENT_SOURCE_DIR}/third_party/variant/include) add_custom_target(FingerPrintConfigure ALL ${CMAKE_COMMAND} "-DOUTPUT_DIR=${CMAKE_CURRENT_BINARY_DIR}" @@ -637,7 +637,7 @@ set_property(TARGET osrm-contract PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE) set_property(TARGET osrm-datastore PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE) set_property(TARGET osrm-routed PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE) -file(GLOB VariantGlob third_party/variant/*.hpp) +file(GLOB VariantGlob third_party/variant/include/mapbox/*.hpp) 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) @@ -652,7 +652,7 @@ install(FILES ${ExtractorHeader} DESTINATION include/osrm/extractor) install(FILES ${ContractorHeader} DESTINATION include/osrm/contractor) install(FILES ${LibraryGlob} DESTINATION include/osrm) install(FILES ${ParametersGlob} DESTINATION include/osrm/engine/api) -install(FILES ${VariantGlob} DESTINATION include/variant) +install(FILES ${VariantGlob} DESTINATION include/mapbox) install(TARGETS osrm-extract DESTINATION bin) install(TARGETS osrm-contract DESTINATION bin) install(TARGETS osrm-datastore DESTINATION bin) diff --git a/include/server/service/base_service.hpp b/include/server/service/base_service.hpp index 11eccbb6f..401a072bc 100644 --- a/include/server/service/base_service.hpp +++ b/include/server/service/base_service.hpp @@ -5,7 +5,7 @@ #include "osrm/osrm.hpp" #include "util/coordinate.hpp" -#include +#include #include #include diff --git a/include/util/json_container.hpp b/include/util/json_container.hpp index 302b71a18..b404b9d33 100644 --- a/include/util/json_container.hpp +++ b/include/util/json_container.hpp @@ -31,7 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef JSON_CONTAINER_HPP #define JSON_CONTAINER_HPP -#include +#include #include #include