AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[build] Fixed paths in osrm build

Browse source
This commit is contained in:
Ilya Zverev 2016-10-03 20:39:21 +03:00
parent 2721527bd6
commit e61c5e6f2c
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
3party/3party.pro
View file

@ -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

10
3party/osrm/osrm-backend/CMakeLists.txt
View file

@ -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})

3
tools/unix/build_omim.sh
View file

@ -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()