X-Git-Url: http://git.maemo.org/git/?p=qtrapids;a=blobdiff_plain;f=src%2Fclient%2FCMakeLists.txt;h=da3d8b5e81c96ca419af5874aae2624fe5cf1553;hp=d2ae12dbdfe0542e8093d240c7043cc2b17368bb;hb=1d97c0a567b80cf9fc67791669debfe3aa9c4c84;hpb=06410091b1e07c443849f0fe71050654c6fb9710;ds=sidebyside

diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index d2ae12d..da3d8b5 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -1,6 +1,6 @@
 INCLUDE(${QT_USE_FILE})
 
-INCLUDE_DIRECTORIES(../include)
+INCLUDE_DIRECTORIES(../include ../plugins)
 
 FIND_LIBRARY(BOOST_SYSTEM boost_system-mt)
 IF(${BOOST_SYSTEM} STREQUAL BOOST_SYSTEM-NOTFOUND)
@@ -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,13 +32,29 @@ SET(SRC
   ./PreferencesDialog.cpp
   ./proxy.cpp
   ./SeedView.cpp
+  ./ColumnSelectorDialog.cpp
 )
 
 QT4_WRAP_CPP(SRC ${MOC_HEADERS})
-ADD_EXECUTABLE(qtrapids ${SRC} ${MOC_HEADERS})
+ADD_EXECUTABLE(qtrapids-gui ${SRC} ${MOC_HEADERS})
+INSTALL(TARGETS qtrapids-gui DESTINATION bin)
 
 ADD_DEFINITIONS(-DQT_SHARED)
-TARGET_LINK_LIBRARIES(qtrapids 
+
+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-gui
   ${QT_QTGUI_LIBRARY} 
   ${QT_QTCORE_LIBRARY} 
   ${QT_QTDBUS_LIBRARY}
@@ -45,4 +62,18 @@ TARGET_LINK_LIBRARIES(qtrapids
   -lboost_system-mt
 )
 
-ADD_DEPENDENCIES(qtrapids dbusapi)
+# 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-gui  ${QT_QTMAEMO5_LIBRARY})
+endif (SCRATCHBOX_UNAME)
+
+#MESSAGE(${CMAKE_HOST_SYSTEM_PROCESSOR}) 
+#CHECK_LIBRARY_EXISTS(QT_QTMAEMO5_LIBRARY)
+
+
+
+ADD_DEPENDENCIES(qtrapids-gui dbusapi)