diff options
| author | <philippe colliot> | 2015-06-12 18:07:49 +0200 |
|---|---|---|
| committer | <philippe colliot> | 2015-06-12 18:07:49 +0200 |
| commit | f297227b640e6ffb1f56c1a01bc4a8c20a4ace32 (patch) | |
| tree | ab2aa4835e7e6383b7ed48f4568a6311afe24a25 | |
| parent | a5fbb07b1598d5eb3c08acd84bfe157e5cbdffd8 (diff) | |
| download | poi-service-f297227b640e6ffb1f56c1a01bc4a8c20a4ace32.tar.gz | |
Some more settings sent to parent
| -rw-r--r-- | src/navigation/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | src/poi-service/run | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/navigation/CMakeLists.txt b/src/navigation/CMakeLists.txt index 2cf979c..3827bba 100644 --- a/src/navigation/CMakeLists.txt +++ b/src/navigation/CMakeLists.txt @@ -59,6 +59,8 @@ set(PRELOAD_CACHE_FOR_PLUGINS "${NAVIT_CONFIG_H_DIR}/cmake_plugin_settings.txt") get_directory_property(hasParent PARENT_DIRECTORY) if(hasParent) +set(API_DIR_PARENT_SCOPE ${API_DIR} PARENT_SCOPE) +set(POSITIONING_API_DIR_PARENT_SCOPE ${CMAKE_CURRENT_SOURCE_DIR}/positioning/enhanced-position-service/dbus/api PARENT_SCOPE) set(DBUS_GENERATED_INCLUDE_DIR_PARENT_SCOPE ${DBUS_GENERATED_INCLUDE_DIR} PARENT_SCOPE) set(DBUS_GENERATED_INCLUDE_DIR_POSITIONING_PARENT_SCOPE ${DBUS_GENERATED_INCLUDE_DIR_POSITIONING} PARENT_SCOPE) endif(hasParent) diff --git a/src/poi-service/run b/src/poi-service/run index 2849902..bf47475 100755 --- a/src/poi-service/run +++ b/src/poi-service/run @@ -28,9 +28,9 @@ CURDIR=$PWD -ROOT_DIR=$CURDIR -BIN_DIR=$ROOT_DIR/bin -RESOURCE_DIR=$ROOT_DIR/resource +BIN_DIR=$CURDIR/bin +POI_SERVER_BIN_DIR=$BIN_DIR +RESOURCE_DIR=$CURDIR/resource MAIN_DATABASE=$RESOURCE_DIR/poi-database-sample.db ADDITIONAL_DATABASE=$RESOURCE_DIR/poi-database-managed.db @@ -38,7 +38,7 @@ echo 'kill reminding orphan process if necessary' ./kill-all echo '------------------------start the server------------------------' -$BIN_DIR/poi-server -f $MAIN_DATABASE & +$POI_SERVER_BIN_DIR/poi-server -f $MAIN_DATABASE & echo '------------------------start the manager server------------------------' #$MANAGER_SERVER_EXE_DIR/poi-manager-server -f $ADDITIONAL_DATABASE & |