- Register also GUI DBus-client to DBus

[qtrapids] / src / client / CMakeLists.txt

diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index 5546525..38cc9c0 100644 (file)
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -14,7 +14,7 @@ INCLUDE_DIRECTORIES(
    ${QT_QTGUI}
 )
 
-SET_SOURCE_FILES_PROPERTIES(./proxy.cpp ./proxy.h PROPERTIES GENERATED 1)
+SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/proxy.cpp ${CMAKE_CURRENT_SOURCE_DIR}/proxy.h PROPERTIES GENERATED 1)
 
 SET(MOC_HEADERS
   ./DownloadView.h
@@ -22,6 +22,7 @@ SET(MOC_HEADERS
   ./PreferencesDialog.h
   ./proxy.h
   ./SeedView.h
+  ./ColumnSelectorDialog.h
 )
 
 SET(SRC
@@ -31,12 +32,27 @@ SET(SRC
   ./PreferencesDialog.cpp
   ./proxy.cpp
   ./SeedView.cpp
+  ./ColumnSelectorDialog.cpp
 )
 
 QT4_WRAP_CPP(SRC ${MOC_HEADERS})
 ADD_EXECUTABLE(qtrapids ${SRC} ${MOC_HEADERS})
 
 ADD_DEFINITIONS(-DQT_SHARED)
+
+set(QT_QTMAEMO5_LIBRARY -lQtMaemo5 -L${QT_LIBRARY_DIR})
+
+# QT_QTMAEMO5_* variables are not defined by CMake
+if(NOT QT_QTMAEMO5_INCLUDE_DIR)
+       FIND_PATH(QT_QTMAEMO5_INCLUDE_DIR QtMaemo5
+       PATHS ${QT_HEADERS_DIR}/QtMaemo5 NO_DEFAULT_PATH)
+endif(NOT QT_QTMAEMO5_INCLUDE_DIR)
+if(NOT QT_QTMAEMO5_LIBRARY)
+       FIND_LIBRARY(QT_QTMAEMO5_LIBRARY QtMaemo5
+       PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+endif(NOT QT_QTMAEMO5_LIBRARY)
+
+
 TARGET_LINK_LIBRARIES(qtrapids 
   ${QT_QTGUI_LIBRARY} 
   ${QT_QTCORE_LIBRARY} 
@@ -45,4 +61,18 @@ TARGET_LINK_LIBRARIES(qtrapids
   -lboost_system-mt
 )
 
+# Check if we are building under scratchbox and link with QtMaemo5 only in that case.
+# Thus, we maintain desktop build-ability also
+set (SCRATCHBOX_UNAME $ENV{SBOX_UNAME_MACHINE})
+
+if (SCRATCHBOX_UNAME)
+       MESSAGE("Configuring for building under Scratchbox..")
+       TARGET_LINK_LIBRARIES(qtrapids  ${QT_QTMAEMO5_LIBRARY})
+endif (SCRATCHBOX_UNAME)
+
+#MESSAGE(${CMAKE_HOST_SYSTEM_PROCESSOR}) 
+#CHECK_LIBRARY_EXISTS(QT_QTMAEMO5_LIBRARY)
+
+
+
 ADD_DEPENDENCIES(qtrapids dbusapi)