summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author <philippe colliot>2014-09-23 16:11:42 +0200
committer <philippe colliot>2014-09-23 16:11:42 +0200
commitfb92406d88997bd20c89b094b50db8762e1a4869 (patch)
treeb6976be170ba0e36fd2d44a85be13caf0bc6d549
parent8f449cdaad42c00f7bd5d7e3b81bef5f64caa4a3 (diff)
downloadpoi-service-fb92406d88997bd20c89b094b50db8762e1a4869.tar.gz
navigation: allow to set the path where to clone positioning
-rw-r--r--src/navigation/CMakeLists.txt2
-rwxr-xr-xsrc/navigation/script/build.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/navigation/CMakeLists.txt b/src/navigation/CMakeLists.txt
index b061572..52d75c6 100644
--- a/src/navigation/CMakeLists.txt
+++ b/src/navigation/CMakeLists.txt
@@ -36,7 +36,7 @@ set (svn_get_src_version svnversion)
set(cmake_create_dir cmake -E make_directory)
# Check if positioning stuff with the right version has been cloned and do it if necessary
-set(positioning_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/positioning)
+# positioning_SRC_DIR is set by cmake -Dpositioning_SRC_DIR=<path to positioning src dir>
set(positioning_URL http://git.projects.genivi.org/lbs/positioning.git)
set(positioning_VERSION 09698f63ea27a24c533b4c015155ee9ebd7a3026)
diff --git a/src/navigation/script/build.sh b/src/navigation/script/build.sh
index 0f8d3d1..4777771 100755
--- a/src/navigation/script/build.sh
+++ b/src/navigation/script/build.sh
@@ -134,7 +134,7 @@ build() {
cd $TOP_DIR
mkdir -p bin
cd $TOP_BIN_DIR
- cmake $TOP_DIR
+ cmake -Dpositioning_SRC_DIR=$target_positioning $TOP_DIR
# make navit first, because plugins need navit built stuff
echo ''