diff options
| -rw-r--r-- | 3party/3party.pro | 2 | ||||
| -rwxr-xr-x | 3party/osrm/osrm-backend/CMakeLists.txt | 10 | ||||
| -rwxr-xr-x | tools/unix/build_omim.sh | 3 |
3 files changed, 8 insertions, 7 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}) diff --git a/tools/unix/build_omim.sh b/tools/unix/build_omim.sh index 7ff109011e..0ee6527b24 100755 --- a/tools/unix/build_omim.sh +++ b/tools/unix/build_omim.sh @@ -135,14 +135,13 @@ build_osrm() mkdir -p "$OSRM_TARGET" # First, build omim libraries build_conf_osrm $OSRM_OMIM_CONF "$OSRM_TARGET/omim-build" - OSRM_OMIM_LIBS="omim-build/out/$OSRM_OMIM_CONF" + OSRM_OMIM_LIBS="$(cd "$OSRM_TARGET/omim-build/out/$OSRM_OMIM_CONF"; pwd)" ( cd "$OSRM_TARGET" "$CMAKE" "-DBOOST_ROOT=$BOOST_PATH" -DCMAKE_BUILD_TYPE=$OSRM_CONF "-DOMIM_BUILD_PATH=$OSRM_OMIM_LIBS" "$BACKEND" make clean make ) - rm -r "$OSRM_TARGET/$OSRM_OMIM_LIBS" } build() |