summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author <philippe colliot>2014-09-23 18:26:55 +0200
committer <philippe colliot>2014-09-23 18:26:55 +0200
commit8d333d783b29795fd447cf221911ca5d7fe7228d (patch)
tree71057269238b2016311c3d7b1689f790bfe8d23c
parentfb92406d88997bd20c89b094b50db8762e1a4869 (diff)
downloadpoi-service-8d333d783b29795fd447cf221911ca5d7fe7228d.tar.gz
poi-server: allow to set the path where to clone positioning
-rw-r--r--src/poi-service/poi-server/CMakeLists.txt3
-rwxr-xr-xsrc/poi-service/script/build.sh2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/poi-service/poi-server/CMakeLists.txt b/src/poi-service/poi-server/CMakeLists.txt
index e536bd5..74e6c04 100644
--- a/src/poi-service/poi-server/CMakeLists.txt
+++ b/src/poi-service/poi-server/CMakeLists.txt
@@ -45,7 +45,8 @@ set (git_get_src_version git rev-parse HEAD)
set (git_executable git)
# Check if positioning stuff with the right version has been cloned and make it if necessary
-set(positioning_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../positioning)
+# 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/poi-service/script/build.sh b/src/poi-service/script/build.sh
index 8cce950..2342211 100755
--- a/src/poi-service/script/build.sh
+++ b/src/poi-service/script/build.sh
@@ -45,7 +45,7 @@ build() {
echo 'Building poi-server'
mkdir -p $POI_SERVER_BIN_DIR
cd $POI_SERVER_BIN_DIR
- cmake $POI_SERVER_SRC_DIR && make
+ cmake -Dpositioning_SRC_DIR=$POSITIONING_SRC_DIR $POI_SERVER_SRC_DIR && make
}
clean() {