diff options
| author | asanoaozora <fifitaneki@hotmail.com> | 2016-09-23 15:54:32 +0200 |
|---|---|---|
| committer | asanoaozora <fifitaneki@hotmail.com> | 2016-09-23 15:54:32 +0200 |
| commit | 91a5f1c511c21533fc4ae2314ece462e42a155e9 (patch) | |
| tree | 3ad8061081869b5e75f85339a736324025afa1b8 /src | |
| parent | 4c5be944a506f64427a25ada714a4a6f64e5ebf3 (diff) | |
| download | poi-service-91a5f1c511c21533fc4ae2314ece462e42a155e9.tar.gz | |
fix error in cmake to allow FSA build
Diffstat (limited to 'src')
| -rw-r--r-- | src/navigation/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | src/navigation/build.sh | 27 | ||||
| -rw-r--r-- | src/navigation/navigation-core/enhancedposition-client-plugin/genivi_positioning_enhancedposition.cxx | 2 |
3 files changed, 22 insertions, 9 deletions
diff --git a/src/navigation/CMakeLists.txt b/src/navigation/CMakeLists.txt index bdc00ea..a05b1d2 100644 --- a/src/navigation/CMakeLists.txt +++ b/src/navigation/CMakeLists.txt @@ -58,7 +58,7 @@ set(NAVIGATION_COMMON_DIR "${CMAKE_CURRENT_SOURCE_DIR}/navigation-common") if(NOT ${YOCTO_CONFIG}) set(NAVIT_CMAKE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/navit/cmake") - set(DBUS_GENERATED_INCLUDE_DIR_POSITIONING "${CMAKE_CURRENT_BINARY_DIR}/enhanced-position-service/dbus/api") # this one is for positioning + set(DBUS_GENERATED_INCLUDE_DIR_POSITIONING "${CMAKE_BINARY_DIR}/enhanced-position-service/dbus/api") # this one is for positioning, NB: it uses CMAKE_BINARY_DIR set(NAVIT_CONFIG_H_DIR "${CMAKE_CURRENT_BINARY_DIR}/navit") else() set(NAVIT_CMAKE_DIR "${STAGING_LIBDIR}/navit/cmake") diff --git a/src/navigation/build.sh b/src/navigation/build.sh index 9b35d20..c1d36e4 100755 --- a/src/navigation/build.sh +++ b/src/navigation/build.sh @@ -2,6 +2,7 @@ clean=0 capi=0 +navit=0 commonapi_tools_option="" function check_path_for_capi @@ -30,7 +31,7 @@ function check_path_for_capi commonapi_tools_option="-DDBUS_LIB_PATH="$DBUS_LIB_PATH" -DCOMMONAPI_DBUS_TOOL_DIR="$COMMONAPI_DBUS_TOOL_DIR" -DCOMMONAPI_TOOL_DIR="$COMMONAPI_TOOL_DIR } -while getopts cm opt +while getopts cmn opt do case $opt in c) @@ -39,11 +40,15 @@ do m) capi=1 ;; + n) + navit=1 + ;; \?) echo "Usage:" - echo "$0 [-c] [-m]" + echo "$0 [-cmn]" echo "-c: build with clean" echo "-m: build with commonAPI plugins " + echo "-n: Build navit" exit 1 esac done @@ -66,12 +71,22 @@ mkdir -p build cd build mkdir -p navit cd navit -echo 'build navit' -if [ "$clean" = 1 ] + +if [ "$navit" = 1 ] then - cmake -DDISABLE_QT=1 -DSAMPLE_MAP=0 -Dvehicle/null=1 -Dgraphics/qt_qpainter=0 ../../navit/ + echo 'build navit' + if [ "$clean" = 1 ] + then + cmake -DDISABLE_QT=1 -DSAMPLE_MAP=0 -Dvehicle/null=1 -Dgraphics/qt_qpainter=0 ../../navit/ + fi + make +else + if [ "$clean" = 1 ] + then + cmake -DDISABLE_QT=1 -DSAMPLE_MAP=0 -Dvehicle/null=1 -Dgraphics/qt_qpainter=0 ../../navit/ + make + fi fi -make cd ../ echo 'build navigation' if [ "$clean" = 1 ] diff --git a/src/navigation/navigation-core/enhancedposition-client-plugin/genivi_positioning_enhancedposition.cxx b/src/navigation/navigation-core/enhancedposition-client-plugin/genivi_positioning_enhancedposition.cxx index e1645a2..24d45da 100644 --- a/src/navigation/navigation-core/enhancedposition-client-plugin/genivi_positioning_enhancedposition.cxx +++ b/src/navigation/navigation-core/enhancedposition-client-plugin/genivi_positioning_enhancedposition.cxx @@ -111,7 +111,6 @@ class EnhancedPositionClientProxy { dbg(lvl_debug,"enter\n"); bool position_found=false; - printf("A %ld\n",changedValues); if ((changedValues & (EnhancedPositionServiceTypes::PositionInfoKey::LATITUDE | EnhancedPositionServiceTypes::PositionInfoKey::LONGITUDE)) == (EnhancedPositionServiceTypes::PositionInfoKey::LATITUDE | EnhancedPositionServiceTypes::PositionInfoKey::LONGITUDE)) { position_found=true; @@ -120,7 +119,6 @@ class EnhancedPositionClientProxy printf("B %ld\n",changedValues); event_add_timeout(0, 0, mp_priv->cb); mp_priv->cb_pending=1; - printf("B %ld\n",changedValues); } } }; |