diff options
| author | Ilya Zverev <zverik@textual.ru> | 2016-10-03 20:39:21 +0300 |
|---|---|---|
| committer | Ilya Zverev <zverik@textual.ru> | 2016-10-03 20:40:26 +0300 |
| commit | e61c5e6f2c79bd34ff3e59fdb49ff7ac9264c219 (patch) | |
| tree | 671776baffcf1d049a4fea6b70547bad7ed30d79 /3party | |
| parent | 2721527bd6a6af5e06b84f19ce240a704982e83f (diff) | |
[build] Fixed paths in osrm build
Diffstat (limited to '3party')
| -rw-r--r-- | 3party/3party.pro | 2 | ||||
| -rwxr-xr-x | 3party/osrm/osrm-backend/CMakeLists.txt | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/3party/3party.pro b/3party/3party.pro index 9d4f0ae9ff..ef3924fc67 100644 --- a/3party/3party.pro +++ b/3party/3party.pro @@ -13,7 +13,7 @@ SUBDIRS = freetype fribidi minizip jansson tomcrypt protobuf osrm expat succinct # See https://trello.com/c/tWYSnXSS/22-opening-hours-3party-boost-test-framework. SUBDIRS *= opening_hours # Disable tests for gtool profile, since it needs only routing tests. -CONFIG(desktop):!CONFIG(no-tests):!CONFIG(gtool) { +CONFIG(desktop):!CONFIG(no-tests):!CONFIG(gtool):!CONFIG(osrm) { opening_hours_tests.subdir = opening_hours/opening_hours_tests opening_hours_tests.depends = opening_hours SUBDIRS *= opening_hours_tests diff --git a/3party/osrm/osrm-backend/CMakeLists.txt b/3party/osrm/osrm-backend/CMakeLists.txt index c423dfa58d..314121f2d3 100755 --- a/3party/osrm/osrm-backend/CMakeLists.txt +++ b/3party/osrm/osrm-backend/CMakeLists.txt @@ -12,10 +12,12 @@ include(CheckCXXCompilerFlag) include(FindPackageHandleStandardArgs) set(OMIM_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../.." CACHE PATH "Path to the root of omim repository") -if(CMAKE_BUILD_TYPE MATCHES Debug) - set(OMIM_BUILD_PATH "${OMIM_PATH}/../omim-build-debug/out/debug" CACHE PATH "Path to the debug build of omim") -else() - set(OMIM_BUILD_PATH "${OMIM_PATH}/../omim-build-release/out/release" CACHE PATH "Path to the release build of omim") +if(NOT OMIM_BUILD_PATH) + if(CMAKE_BUILD_TYPE MATCHES Debug) + set(OMIM_BUILD_PATH "${OMIM_PATH}/../omim-build-debug/out/debug" CACHE PATH "Path to the debug build of omim") + else() + set(OMIM_BUILD_PATH "${OMIM_PATH}/../omim-build-release/out/release" CACHE PATH "Path to the release build of omim") + endif() endif() set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) |