add an option to control debug messages

23 files changed, 134 insertions, 11 deletions

diff --git a/src/navigation/map-viewer/configuration-plugin/CMakeLists.txt b/src/navigation/map-viewer/configuration-plugin/CMakeLists.txt
index 8ba14dd..be90770 100644
--- a/src/navigation/map-viewer/configuration-plugin/CMakeLists.txt
+++ b/src/navigation/map-viewer/configuration-plugin/CMakeLists.txt
@@ -33,6 +33,12 @@ include(${navit_SRC_DIR}/navit/cmake/navit_macros.cmake)
 
 add_definitions(-DPLUGIN=1)
 
+message(STATUS "WITH_DEBUG = ${WITH_DEBUG}")
+
+if(WITH_DEBUG)
+    add_definitions("-DDEBUG_ENABLED=1")
+endif()
+
 pkg_search_module(DBUS_CPP dbus-c++-glib-1 dbus-c++-1)
 pkg_search_module(GLIB glib-2.0)
 include_directories(${GLIB_INCLUDE_DIRS})
diff --git a/src/navigation/map-viewer/configuration-plugin/genivi_mapviewer_configuration.cxx b/src/navigation/map-viewer/configuration-plugin/genivi_mapviewer_configuration.cxx
index 1c9ffc3..bd3a41e 100644
--- a/src/navigation/map-viewer/configuration-plugin/genivi_mapviewer_configuration.cxx
+++ b/src/navigation/map-viewer/configuration-plugin/genivi_mapviewer_configuration.cxx
@@ -37,6 +37,11 @@
 #include "navit/plugin.h"
 #include "navit/event.h"
 
+#if (!DEBUG_ENABLED)
+#undef dbg
+#define dbg(level,...) ;
+#endif
+
 static DBus::Glib::BusDispatcher dispatcher;
 static DBus::Connection *conn;
 
diff --git a/src/navigation/map-viewer/mapviewercontrol-plugin/CMakeLists.txt b/src/navigation/map-viewer/mapviewercontrol-plugin/CMakeLists.txt
index 34e3890..ce37af2 100644
--- a/src/navigation/map-viewer/mapviewercontrol-plugin/CMakeLists.txt
+++ b/src/navigation/map-viewer/mapviewercontrol-plugin/CMakeLists.txt
@@ -32,6 +32,12 @@ include(${navit_SRC_DIR}/navit/cmake/navit_macros.cmake)
 
 add_definitions(-DPLUGIN=1)
 
+message(STATUS "WITH_DEBUG = ${WITH_DEBUG}")
+
+if(WITH_DEBUG)
+    add_definitions("-DDEBUG_ENABLED=1")
+endif()
+
 pkg_search_module(DBUS_CPP dbus-c++-glib-1 dbus-c++-1)
 pkg_search_module(GLIB glib-2.0)
 include_directories(${GLIB_INCLUDE_DIRS})
diff --git a/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx b/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
index 382f69f..cc4d3a2 100644
--- a/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
+++ b/src/navigation/map-viewer/mapviewercontrol-plugin/genivi_mapviewer_mapviewercontrol.cxx
@@ -65,6 +65,11 @@
 #include "navit/xmlconfig.h"
 #include "navit/layout.h"
 
+#if (!DEBUG_ENABLED)
+#undef dbg
+#define dbg(level,...) ;
+#endif
+
 static DBus::Glib::BusDispatcher dispatchers[4];
 static DBus::Connection *conns[4];
 static int32_t navigationcore_session=-1;
diff --git a/src/navigation/map-viewer/session-plugin/CMakeLists.txt b/src/navigation/map-viewer/session-plugin/CMakeLists.txt
index 3aa56e9..8fb7070 100644
--- a/src/navigation/map-viewer/session-plugin/CMakeLists.txt
+++ b/src/navigation/map-viewer/session-plugin/CMakeLists.txt
@@ -31,6 +31,12 @@ include(${navit_SRC_DIR}/navit/cmake/navit_macros.cmake)
 
 add_definitions(-DPLUGIN=1)
 
+message(STATUS "WITH_DEBUG = ${WITH_DEBUG}")
+
+if(WITH_DEBUG)
+    add_definitions("-DDEBUG_ENABLED=1")
+endif()
+
 pkg_search_module(DBUS_CPP dbus-c++-glib-1 dbus-c++-1)
 pkg_search_module(GLIB glib-2.0)
 include_directories(${GLIB_INCLUDE_DIRS})
diff --git a/src/navigation/map-viewer/session-plugin/genivi_mapviewer_session.cxx b/src/navigation/map-viewer/session-plugin/genivi_mapviewer_session.cxx
index 092768a..ddb620c 100644
--- a/src/navigation/map-viewer/session-plugin/genivi_mapviewer_session.cxx
+++ b/src/navigation/map-viewer/session-plugin/genivi_mapviewer_session.cxx
@@ -34,6 +34,11 @@
 #include "navit/plugin.h"
 #include "navit/event.h"
 
+#if (!DEBUG_ENABLED)
+#undef dbg
+#define dbg(level,...) ;
+#endif
+
 static DBus::Glib::BusDispatcher dispatcher;
 static DBus::Connection *conn;
 
diff --git a/src/navigation/navigation-core/configuration-plugin/CMakeLists.txt b/src/navigation/navigation-core/configuration-plugin/CMakeLists.txt
index 6ce0f25..a6d41b4 100644
--- a/src/navigation/navigation-core/configuration-plugin/CMakeLists.txt
+++ b/src/navigation/navigation-core/configuration-plugin/CMakeLists.txt
@@ -33,6 +33,12 @@ include(${navit_SRC_DIR}/navit/cmake/navit_macros.cmake)
 
 add_definitions(-DPLUGIN=1)
 
+message(STATUS "WITH_DEBUG = ${WITH_DEBUG}")
+
+if(WITH_DEBUG)
+    add_definitions("-DDEBUG_ENABLED=1")
+endif()
+
 pkg_search_module(DBUS_CPP dbus-c++-glib-1 dbus-c++-1)
 pkg_search_module(GLIB glib-2.0)
 include_directories(${GLIB_INCLUDE_DIRS})
diff --git a/src/navigation/navigation-core/configuration-plugin/genivi_navigationcore_configuration.cxx b/src/navigation/navigation-core/configuration-plugin/genivi_navigationcore_configuration.cxx
index 3e22d00..4d9a475 100644
--- a/src/navigation/navigation-core/configuration-plugin/genivi_navigationcore_configuration.cxx
+++ b/src/navigation/navigation-core/configuration-plugin/genivi_navigationcore_configuration.cxx
@@ -37,6 +37,11 @@
 #include "navit/plugin.h"
 #include "navit/event.h"
 
+#if (!DEBUG_ENABLED)
+#undef dbg
+#define dbg(level,...) ;
+#endif
+
 static DBus::Glib::BusDispatcher dispatcher;
 static DBus::Connection *conn;
 
diff --git a/src/navigation/navigation-core/enhancedposition-plugin/CMakeLists.txt b/src/navigation/navigation-core/enhancedposition-plugin/CMakeLists.txt
index e0c0f9a..0e5a2dc 100644
--- a/src/navigation/navigation-core/enhancedposition-plugin/CMakeLists.txt
+++ b/src/navigation/navigation-core/enhancedposition-plugin/CMakeLists.txt
@@ -31,6 +31,12 @@ include(${navit_SRC_DIR}/navit/cmake/navit_macros.cmake)
 
 add_definitions(-DPLUGIN=1)
 
+message(STATUS "WITH_DEBUG = ${WITH_DEBUG}")
+
+if(WITH_DEBUG)
+    add_definitions("-DDEBUG_ENABLED=1")
+endif()
+
 pkg_search_module(DBUS_CPP dbus-c++-glib-1 dbus-c++-1)
 pkg_search_module(GLIB glib-2.0)
 include_directories(${GLIB_INCLUDE_DIRS})
diff --git a/src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx b/src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx
index 89b2c3a..acd22af 100644
--- a/src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx
+++ b/src/navigation/navigation-core/enhancedposition-plugin/genivi_positioning_enhancedposition.cxx
@@ -68,6 +68,11 @@
 
 #include "time.h"
 
+#if (!DEBUG_ENABLED)
+#undef dbg
+#define dbg(level,...) ;
+#endif
+
 #include "genivi-positioning-enhancedposition_proxy.h"
 
 DBus::Glib::BusDispatcher dispatcher;
diff --git a/src/navigation/navigation-core/guidance-plugin/CMakeLists.txt b/src/navigation/navigation-core/guidance-plugin/CMakeLists.txt
index 802b1fe..576fa31 100644
--- a/src/navigation/navigation-core/guidance-plugin/CMakeLists.txt
+++ b/src/navigation/navigation-core/guidance-plugin/CMakeLists.txt
@@ -31,6 +31,12 @@ include(${navit_SRC_DIR}/navit/cmake/navit_macros.cmake)
 
 add_definitions(-DPLUGIN=1)
 
+message(STATUS "WITH_DEBUG = ${WITH_DEBUG}")
+
+if(WITH_DEBUG)
+    add_definitions("-DDEBUG_ENABLED=1")
+endif()
+
 pkg_search_module(DBUS_CPP dbus-c++-glib-1 dbus-c++-1)
 pkg_search_module(GLIB glib-2.0)
 include_directories(${GLIB_INCLUDE_DIRS})
diff --git a/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx b/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx
index 52dc82d..b922096 100644
--- a/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx
+++ b/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx
@@ -44,6 +44,11 @@
 #include "navit/vehicle.h"
 #include "navit/route.h"
 
+#if (!DEBUG_ENABLED)
+#undef dbg
+#define dbg(level,...) ;
+#endif
+
 static DBus::Glib::BusDispatcher dispatcher;
 static DBus::Connection *conn;
 
diff --git a/src/navigation/navigation-core/locationinput-plugin/CMakeLists.txt b/src/navigation/navigation-core/locationinput-plugin/CMakeLists.txt
index 44a72a0..f39c42b 100644
--- a/src/navigation/navigation-core/locationinput-plugin/CMakeLists.txt
+++ b/src/navigation/navigation-core/locationinput-plugin/CMakeLists.txt
@@ -31,6 +31,12 @@ include(${navit_SRC_DIR}/navit/cmake/navit_macros.cmake)
 
 add_definitions(-DPLUGIN=1)
 
+message(STATUS "WITH_DEBUG = ${WITH_DEBUG}")
+
+if(WITH_DEBUG)
+    add_definitions("-DDEBUG_ENABLED=1")
+endif()
+
 pkg_search_module(DBUS_CPP dbus-c++-glib-1 dbus-c++-1)
 pkg_search_module(GLIB glib-2.0)
 include_directories(${GLIB_INCLUDE_DIRS})
diff --git a/src/navigation/navigation-core/locationinput-plugin/genivi_navigationcore_locationinput.cxx b/src/navigation/navigation-core/locationinput-plugin/genivi_navigationcore_locationinput.cxx
index 8c6ce68..3afbd56 100644
--- a/src/navigation/navigation-core/locationinput-plugin/genivi_navigationcore_locationinput.cxx
+++ b/src/navigation/navigation-core/locationinput-plugin/genivi_navigationcore_locationinput.cxx
@@ -41,6 +41,11 @@
 #include "navit/coord.h"
 #include "navit/transform.h"
 
+#if (!DEBUG_ENABLED)
+#undef dbg
+#define dbg(level,...) ;
+#endif
+
 static DBus::Glib::BusDispatcher dispatcher;
 static DBus::Connection *conn;
 
diff --git a/src/navigation/navigation-core/mapmatchedposition-plugin/CMakeLists.txt b/src/navigation/navigation-core/mapmatchedposition-plugin/CMakeLists.txt
index 49a6fb3..11afa06 100644
--- a/src/navigation/navigation-core/mapmatchedposition-plugin/CMakeLists.txt
+++ b/src/navigation/navigation-core/mapmatchedposition-plugin/CMakeLists.txt
@@ -31,6 +31,12 @@ include(${navit_SRC_DIR}/navit/cmake/navit_macros.cmake)
 
 add_definitions(-DPLUGIN=1)
 
+message(STATUS "WITH_DEBUG = ${WITH_DEBUG}")
+
+if(WITH_DEBUG)
+    add_definitions("-DDEBUG_ENABLED=1")
+endif()
+
 pkg_search_module(DBUS_CPP dbus-c++-glib-1 dbus-c++-1)
 pkg_search_module(GLIB glib-2.0)
 include_directories(${GLIB_INCLUDE_DIRS})
diff --git a/src/navigation/navigation-core/mapmatchedposition-plugin/genivi_navigationcore_mapmatchedposition.cxx b/src/navigation/navigation-core/mapmatchedposition-plugin/genivi_navigationcore_mapmatchedposition.cxx
index 78040b7..cbbcf11 100644
--- a/src/navigation/navigation-core/mapmatchedposition-plugin/genivi_navigationcore_mapmatchedposition.cxx
+++ b/src/navigation/navigation-core/mapmatchedposition-plugin/genivi_navigationcore_mapmatchedposition.cxx
@@ -44,6 +44,11 @@
 #include "navit/route.h"
 #include "navit/config_.h"
 
+#if (!DEBUG_ENABLED)
+#undef dbg
+#define dbg(level,...) ;
+#endif
+
 static DBus::Glib::BusDispatcher dispatcher;
 static DBus::Connection *conn;
 static class MapMatchedPosition *server;
diff --git a/src/navigation/navigation-core/routing-plugin/CMakeLists.txt b/src/navigation/navigation-core/routing-plugin/CMakeLists.txt
index d7c15e3..12124b0 100644
--- a/src/navigation/navigation-core/routing-plugin/CMakeLists.txt
+++ b/src/navigation/navigation-core/routing-plugin/CMakeLists.txt
@@ -31,6 +31,12 @@ include(${navit_SRC_DIR}/navit/cmake/navit_macros.cmake)
 
 add_definitions(-DPLUGIN=1)
 
+message(STATUS "WITH_DEBUG = ${WITH_DEBUG}")
+
+if(WITH_DEBUG)
+    add_definitions("-DDEBUG_ENABLED=1")
+endif()
+
 pkg_search_module(DBUS_CPP dbus-c++-glib-1 dbus-c++-1)
 pkg_search_module(GLIB glib-2.0)
 include_directories(${GLIB_INCLUDE_DIRS})
diff --git a/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx b/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx
index f674966..fcb14b0 100644
--- a/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx
+++ b/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx
@@ -48,6 +48,11 @@
 #include "navit/map.h"
 #include "navit/event.h"
 
+#if (!DEBUG_ENABLED)
+#undef dbg
+#define dbg(level,...) ;
+#endif
+
 static DBus::Glib::BusDispatcher dispatcher;
 static DBus::Connection *conn;
 
diff --git a/src/navigation/navigation-core/session-plugin/CMakeLists.txt b/src/navigation/navigation-core/session-plugin/CMakeLists.txt
index 3d9462c..a616082 100644
--- a/src/navigation/navigation-core/session-plugin/CMakeLists.txt
+++ b/src/navigation/navigation-core/session-plugin/CMakeLists.txt
@@ -31,6 +31,12 @@ include(${navit_SRC_DIR}/navit/cmake/navit_macros.cmake)
 
 add_definitions(-DPLUGIN=1)
 
+message(STATUS "WITH_DEBUG = ${WITH_DEBUG}")
+
+if(WITH_DEBUG)
+    add_definitions("-DDEBUG_ENABLED=1")
+endif()
+
 pkg_search_module(DBUS_CPP dbus-c++-glib-1 dbus-c++-1)
 pkg_search_module(GLIB glib-2.0)
 include_directories(${GLIB_INCLUDE_DIRS})
diff --git a/src/navigation/navigation-core/session-plugin/genivi_navigationcore_session.cxx b/src/navigation/navigation-core/session-plugin/genivi_navigationcore_session.cxx
index b1dd159..4782805 100644
--- a/src/navigation/navigation-core/session-plugin/genivi_navigationcore_session.cxx
+++ b/src/navigation/navigation-core/session-plugin/genivi_navigationcore_session.cxx
@@ -34,6 +34,11 @@
 #include "navit/plugin.h"
 #include "navit/event.h"
 
+#if (!DEBUG_ENABLED)
+#undef dbg
+#define dbg(level,...) ;
+#endif
+
 static DBus::Glib::BusDispatcher dispatcher;
 static DBus::Connection *conn;
 
diff --git a/src/navigation/poi-cam/CMakeLists.txt b/src/navigation/poi-cam/CMakeLists.txt
index 7e5d772..bacf71a 100644
--- a/src/navigation/poi-cam/CMakeLists.txt
+++ b/src/navigation/poi-cam/CMakeLists.txt
@@ -31,6 +31,12 @@ include(${navit_SRC_DIR}/navit/cmake/navit_macros.cmake)
 
 add_definitions(-DPLUGIN=1)
 
+message(STATUS "WITH_DEBUG = ${WITH_DEBUG}")
+
+if(WITH_DEBUG)
+    add_definitions("-DDEBUG_ENABLED=1")
+endif()
+
 pkg_search_module(DBUS_CPP dbus-c++-glib-1 dbus-c++-1)
 pkg_search_module(GLIB glib-2.0)
 include_directories(${GLIB_INCLUDE_DIRS})
diff --git a/src/navigation/poi-cam/genivi_poiservice_cam_navit.cxx b/src/navigation/poi-cam/genivi_poiservice_cam_navit.cxx
index dafcc3e..fad47bd 100644
--- a/src/navigation/poi-cam/genivi_poiservice_cam_navit.cxx
+++ b/src/navigation/poi-cam/genivi_poiservice_cam_navit.cxx
@@ -40,6 +40,12 @@
 #include "navit/transform.h"
 #include "navit/map.h"
 #include "navit/mapset.h"
+
+#if (!DEBUG_ENABLED)
+#undef dbg
+#define dbg(level,...) ;
+#endif
+
 #include "genivi-poiservice-constants.h"
 #include "genivi-poiservice-poicontentaccess_proxy.h"
 #include "genivi-poiservice-contentaccessmodule_adaptor.h"
diff --git a/src/navigation/script/build.sh b/src/navigation/script/build.sh
index 7929b81..7de97cd 100755
--- a/src/navigation/script/build.sh
+++ b/src/navigation/script/build.sh
@@ -52,6 +52,7 @@ target_ilm=$PWD/../$IVI_LAYER_MANAGER #by default
 #--------------------------------------------------------------------------
 # modify the following flags as needed:
 NAVIT_FLAGS='-DDISABLE_QT=1 -DSAMPLE_MAP=0 -Dvehicle/null=1 -Dgraphics/qt_qpainter=0'
+NAVIT_PLUGIN_FLAGS='-DWITH_DEBUG=OFF'
 #
 
 # by default no ilm 
@@ -260,37 +261,37 @@ build() {
     cd $NAVIGATION_CORE_BIN_DIR
     mkdir -p $NAVIGATION_CORE_CONFIGURATION
     cd $NAVIGATION_CORE_CONFIGURATION_BIN_DIR 
-    cmake -Wno-dev -C $NAVIT_BIN_DIR/cmake_plugin_settings.txt -Dgenerated_api_DIR=$GENERATED_API_DIR -Dnavit_SRC_DIR=$NAVIT_SRC_DIR $NAVIGATION_CORE_CONFIGURATION_SRC_DIR && make 
+    cmake -Wno-dev -C $NAVIT_BIN_DIR/cmake_plugin_settings.txt -Dgenerated_api_DIR=$GENERATED_API_DIR -Dnavit_SRC_DIR=$NAVIT_SRC_DIR $NAVIT_PLUGIN_FLAGS $NAVIGATION_CORE_CONFIGURATION_SRC_DIR && make 
 
     cd $NAVIGATION_CORE_BIN_DIR
     mkdir -p $NAVIGATION_CORE_GUIDANCE
     cd $NAVIGATION_CORE_GUIDANCE_BIN_DIR 
-    cmake -Wno-dev -C $NAVIT_BIN_DIR/cmake_plugin_settings.txt -Dgenerated_api_DIR=$GENERATED_API_DIR -Dnavit_SRC_DIR=$NAVIT_SRC_DIR $NAVIGATION_CORE_GUIDANCE_SRC_DIR && make 
+    cmake -Wno-dev -C $NAVIT_BIN_DIR/cmake_plugin_settings.txt -Dgenerated_api_DIR=$GENERATED_API_DIR -Dnavit_SRC_DIR=$NAVIT_SRC_DIR $NAVIT_PLUGIN_FLAGS $NAVIGATION_CORE_GUIDANCE_SRC_DIR && make 
 
     cd $NAVIGATION_CORE_BIN_DIR
     mkdir -p $NAVIGATION_CORE_LOCATIONINPUT
     cd $NAVIGATION_CORE_LOCATIONINPUT_BIN_DIR 
-    cmake -Wno-dev -C $NAVIT_BIN_DIR/cmake_plugin_settings.txt -Dgenerated_api_DIR=$GENERATED_API_DIR -Dnavit_SRC_DIR=$NAVIT_SRC_DIR $NAVIGATION_CORE_LOCATIONINPUT_SRC_DIR && make 
+    cmake -Wno-dev -C $NAVIT_BIN_DIR/cmake_plugin_settings.txt -Dgenerated_api_DIR=$GENERATED_API_DIR -Dnavit_SRC_DIR=$NAVIT_SRC_DIR $NAVIT_PLUGIN_FLAGS $NAVIGATION_CORE_LOCATIONINPUT_SRC_DIR && make 
 
     cd $NAVIGATION_CORE_BIN_DIR
     mkdir -p $NAVIGATION_CORE_MAPMATCHEDPOSITION
     cd $NAVIGATION_CORE_MAPMATCHEDPOSITION_BIN_DIR 
-    cmake -Wno-dev -C $NAVIT_BIN_DIR/cmake_plugin_settings.txt -Dgenerated_api_DIR=$GENERATED_API_DIR -Dnavit_SRC_DIR=$NAVIT_SRC_DIR $NAVIGATION_CORE_MAPMATCHEDPOSITION_SRC_DIR && make 
+    cmake -Wno-dev -C $NAVIT_BIN_DIR/cmake_plugin_settings.txt -Dgenerated_api_DIR=$GENERATED_API_DIR -Dnavit_SRC_DIR=$NAVIT_SRC_DIR $NAVIT_PLUGIN_FLAGS $NAVIGATION_CORE_MAPMATCHEDPOSITION_SRC_DIR && make 
 
     cd $NAVIGATION_CORE_BIN_DIR
     mkdir -p $NAVIGATION_CORE_ROUTING
     cd $NAVIGATION_CORE_ROUTING_BIN_DIR 
-    cmake -Wno-dev -C $NAVIT_BIN_DIR/cmake_plugin_settings.txt -Dgenerated_api_DIR=$GENERATED_API_DIR -Dnavit_SRC_DIR=$NAVIT_SRC_DIR $NAVIGATION_CORE_ROUTING_SRC_DIR && make 
+    cmake -Wno-dev -C $NAVIT_BIN_DIR/cmake_plugin_settings.txt -Dgenerated_api_DIR=$GENERATED_API_DIR -Dnavit_SRC_DIR=$NAVIT_SRC_DIR $NAVIT_PLUGIN_FLAGS $NAVIGATION_CORE_ROUTING_SRC_DIR && make 
 
     cd $NAVIGATION_CORE_BIN_DIR
     mkdir -p $NAVIGATION_CORE_SESSION
     cd $NAVIGATION_CORE_SESSION_BIN_DIR 
-    cmake -Wno-dev -C $NAVIT_BIN_DIR/cmake_plugin_settings.txt -Dgenerated_api_DIR=$GENERATED_API_DIR -Dnavit_SRC_DIR=$NAVIT_SRC_DIR $NAVIGATION_CORE_SESSION_SRC_DIR && make 
+    cmake -Wno-dev -C $NAVIT_BIN_DIR/cmake_plugin_settings.txt -Dgenerated_api_DIR=$GENERATED_API_DIR -Dnavit_SRC_DIR=$NAVIT_SRC_DIR $NAVIT_PLUGIN_FLAGS $NAVIGATION_CORE_SESSION_SRC_DIR && make 
 
     cd $NAVIGATION_CORE_BIN_DIR
     mkdir -p $NAVIGATION_CORE_ENHANCEDPOSITION
     cd $NAVIGATION_CORE_ENHANCEDPOSITION_BIN_DIR 
-    cmake -Wno-dev -C $NAVIT_BIN_DIR/cmake_plugin_settings.txt -Dpositioning_API=$POSITIONING_API_DIR -Dapi_DIR=$API_DIR -Dgenerated_api_DIR=$GENERATED_API_DIR -Dnavit_SRC_DIR=$NAVIT_SRC_DIR $NAVIGATION_CORE_ENHANCEDPOSITION_SRC_DIR && make 
+    cmake -Wno-dev -C $NAVIT_BIN_DIR/cmake_plugin_settings.txt -Dpositioning_API=$POSITIONING_API_DIR -Dapi_DIR=$API_DIR -Dgenerated_api_DIR=$GENERATED_API_DIR -Dnavit_SRC_DIR=$NAVIT_SRC_DIR $NAVIT_PLUGIN_FLAGS $NAVIGATION_CORE_ENHANCEDPOSITION_SRC_DIR && make 
 
 	cd $TOP_BIN_DIR
 	mkdir -p $MAP_VIEWER
@@ -300,22 +301,22 @@ build() {
     cd $MAP_VIEWER_BIN_DIR
     mkdir -p $MAP_VIEWER_CONFIGURATION
     cd $MAP_VIEWER_CONFIGURATION_BIN_DIR 
-    cmake -Wno-dev -C $NAVIT_BIN_DIR/cmake_plugin_settings.txt -Dgenerated_api_DIR=$GENERATED_API_DIR -Dnavit_SRC_DIR=$NAVIT_SRC_DIR $MAP_VIEWER_CONFIGURATION_SRC_DIR && make 
+    cmake -Wno-dev -C $NAVIT_BIN_DIR/cmake_plugin_settings.txt -Dgenerated_api_DIR=$GENERATED_API_DIR -Dnavit_SRC_DIR=$NAVIT_SRC_DIR $NAVIT_PLUGIN_FLAGS $MAP_VIEWER_CONFIGURATION_SRC_DIR && make 
 
     cd $MAP_VIEWER_BIN_DIR
     mkdir -p $MAP_VIEWER_MAPVIEWERCONTROL
     cd $MAP_VIEWER_MAPVIEWERCONTROL_BIN_DIR 
-    cmake -Wno-dev -C $NAVIT_BIN_DIR/cmake_plugin_settings.txt -DLM=$lm -Dlayer_management_INST=$layer_management_INST -Dgenerated_api_DIR=$GENERATED_API_DIR -Dnavit_SRC_DIR=$NAVIT_SRC_DIR $MAP_VIEWER_MAPVIEWERCONTROL_SRC_DIR && make 
+    cmake -Wno-dev -C $NAVIT_BIN_DIR/cmake_plugin_settings.txt -DLM=$lm -Dlayer_management_INST=$target_ilm -Dgenerated_api_DIR=$GENERATED_API_DIR -Dnavit_SRC_DIR=$NAVIT_SRC_DIR $NAVIT_PLUGIN_FLAGS $MAP_VIEWER_MAPVIEWERCONTROL_SRC_DIR && make 
 
     cd $MAP_VIEWER_BIN_DIR
     mkdir -p $MAP_VIEWER_SESSION
     cd $MAP_VIEWER_SESSION_BIN_DIR 
-    cmake -Wno-dev -C $NAVIT_BIN_DIR/cmake_plugin_settings.txt -Dgenerated_api_DIR=$GENERATED_API_DIR -Dnavit_SRC_DIR=$NAVIT_SRC_DIR $MAP_VIEWER_SESSION_SRC_DIR && make 
+    cmake -Wno-dev -C $NAVIT_BIN_DIR/cmake_plugin_settings.txt -Dgenerated_api_DIR=$GENERATED_API_DIR -Dnavit_SRC_DIR=$NAVIT_SRC_DIR $NAVIT_PLUGIN_FLAGS $MAP_VIEWER_SESSION_SRC_DIR && make 
 
     cd $TOP_BIN_DIR
     mkdir -p $POI_CAM
     cd $POI_CAM_BIN_DIR 
-    cmake -Wno-dev -C $NAVIT_BIN_DIR/cmake_plugin_settings.txt -Dgenerated_api_DIR=$GENERATED_API_DIR -Dnavit_SRC_DIR=$NAVIT_SRC_DIR $POI_CAM_SRC_DIR && make 
+    cmake -Wno-dev -C $NAVIT_BIN_DIR/cmake_plugin_settings.txt -Dgenerated_api_DIR=$GENERATED_API_DIR -Dnavit_SRC_DIR=$NAVIT_SRC_DIR $NAVIT_PLUGIN_FLAGS $POI_CAM_SRC_DIR && make 
 
 }