From 2658eef26ffcabfeee9450bb5fef8c52c618447b Mon Sep 17 00:00:00 2001
From:  <philippe colliot>
Date: Thu, 17 Mar 2016 14:07:53 +0100
Subject: Fix issue when speech is not used

---
 src/navigation/CMakeLists.txt                                       | 6 +++---
 src/navigation/navigation-core/guidance-plugin/CMakeLists.txt       | 2 +-
 .../guidance-plugin/genivi_navigationcore_guidance.cxx              | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/navigation/CMakeLists.txt b/src/navigation/CMakeLists.txt
index d25997b..f8a7ef4 100644
--- a/src/navigation/CMakeLists.txt
+++ b/src/navigation/CMakeLists.txt
@@ -62,12 +62,10 @@ 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_SPEECH "${CMAKE_CURRENT_BINARY_DIR}/dbus-include/speech-service") # this one is for speech
     set(NAVIT_CONFIG_H_DIR "${CMAKE_CURRENT_BINARY_DIR}/navit")
 else()
     set(NAVIT_CMAKE_DIR "${STAGING_LIBDIR}/navit/cmake")
     set(DBUS_GENERATED_INCLUDE_DIR_POSITIONING "${STAGING_INCDIR}/positioning") # this one is for positioning
-    set(DBUS_GENERATED_INCLUDE_DIR_SPEECH "${STAGING_INCDIR}/speechservice") # this one is for speech
     set(NAVIT_CONFIG_H_DIR "${STAGING_DATADIR}")
 endif()
 
@@ -114,7 +112,9 @@ add_subdirectory(${API_DIR}/map-viewer "${DBUS_GENERATED_INCLUDE_DIR}/map-viewer
 
 add_subdirectory(${API_DIR}/poi-service "${DBUS_GENERATED_INCLUDE_DIR}/poi-service")
 
-add_subdirectory(${API_DIR}/speech-service "${DBUS_GENERATED_INCLUDE_DIR}/speech-service")
+if(${WITH_SPEECH})
+    add_subdirectory(${API_DIR}/speech-service "${DBUS_GENERATED_INCLUDE_DIR}/speech-service")
+endif()
 
 include(${NAVIT_CMAKE_DIR}/navit_macros.cmake)
 
diff --git a/src/navigation/navigation-core/guidance-plugin/CMakeLists.txt b/src/navigation/navigation-core/guidance-plugin/CMakeLists.txt
index 2b1d07a..b1f6a34 100644
--- a/src/navigation/navigation-core/guidance-plugin/CMakeLists.txt
+++ b/src/navigation/navigation-core/guidance-plugin/CMakeLists.txt
@@ -32,10 +32,10 @@ message(STATUS "guidance")
 
 if(WITH_SPEECH)
     add_definitions("-DSPEECH_ENABLED=1")
+    include_directories(${DBUS_GENERATED_INCLUDE_DIR}/speech-service)
 endif()
 
 include_directories(${DBUS_GENERATED_INCLUDE_DIR}/navigation-core)
-include_directories(${DBUS_GENERATED_INCLUDE_DIR_SPEECH})
 
 set(genivi_navigationcore_guidance_LIBS ${PLUGIN_LDFLAGS})
 set(genivi_navigationcore_guidance_LIBRARY_DIRS ${PLUGIN_LIBRARIES})
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 28dd64b..ce6e4f5 100644
--- a/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx
+++ b/src/navigation/navigation-core/guidance-plugin/genivi_navigationcore_guidance.cxx
@@ -30,8 +30,10 @@
 #include "genivi-navigationcore-constants.h"
 #include "genivi-navigationcore-guidance_adaptor.h"
 
+#if (SPEECH_ENABLED)
 #include "genivi-speechservice-constants.h"
 #include "genivi-speechservice-speechoutput_proxy.h"
+#endif
 
 #include "config.h"
 #define USE_PLUGINS 1
-- 
cgit v1.2.1