[patch] Correct dbus related lines in CMakeLists.txt

patch (text/plain), 1.40 KB, created by martin.schmidt13 on 2016-02-13 17:58:57 UTC

--- a/src/CMakeLists.txt	2014-08-28 08:22:28.000000000 +0200
+++ b/src/CMakeLists.txt	2016-02-13 19:43:22.000000000 +0100
@@ -277,9 +277,6 @@
     CImageViewer.cpp
     CMapRmp.cpp
     CMapDEMSlopeSetup.cpp
-    IExchange.cpp
-    CExchangeGarmin.cpp
-    CExchangeTwoNav.cpp
 )
 
 if (WIN32)
@@ -464,9 +461,6 @@
     CMapRmp.h
     CMapDEMSlopeSetup.h
     QFileExt.h
-    IExchange.h
-    CExchangeGarmin.h
-    CExchangeTwoNav.h
 )
 
 
@@ -595,9 +589,25 @@
 
 
 IF(DBUS)
+
+  set(qlandkarte_include_dirs
+    ${qlandkarte_include_dirs}
+    ${QT_QTDBUS_INCLUDE_DIR}
+    ${CMAKE_SOURCE_DIR}/3rdparty/SerialPort
+  )
+
+
     add_definitions(-DHAS_DBUS)
     SET(qlandkarte_HDRS ${qlandkarte_HDRS}  CDBus.h)
+    SET(qlandkarte_HDRS ${qlandkarte_HDRS}  IExchange.h)
+    SET(qlandkarte_HDRS ${qlandkarte_HDRS}  CExchangeGarmin.h)
+    SET(qlandkarte_HDRS ${qlandkarte_HDRS}  CExchangeTwoNav.h)
+
     SET(qlandkarte_SRCS ${qlandkarte_SRCS}  CDBus.cpp)
+    SET(qlandkarte_SRCS ${qlandkarte_SRCS}  IExchange.cpp)
+    SET(qlandkarte_SRCS ${qlandkarte_SRCS}  CExchangeGarmin.cpp)
+    SET(qlandkarte_SRCS ${qlandkarte_SRCS}  CExchangeTwoNav.cpp)
+
     SET(qlandkarte_UIS ${qlandkarte_UIS})
 ENDIF(DBUS)
 
@@ -678,7 +688,6 @@
   ${QT_QTSQL_INCLUDE_DIR}
   ${QT_QTOPENGL_INCLUDE_DIR}
   ${QT_QTNETWORK_INCLUDE_DIR}
-  ${QT_QTDBUS_INCLUDE_DIR}
   ${QT_QTWEBKIT_INCLUDE_DIR}
   ${QT_QTSCRIPT_INCLUDE_DIR}
   ${QT_OPENGL_INCLUDE_DIR}