X-Git-Url: http://git.maemo.org/git/?p=qtrapids;a=blobdiff_plain;f=src%2Fclient%2FCMakeLists.txt;h=873b699c0af7415a08137614c1975f89898c06e0;hp=da3d8b5e81c96ca419af5874aae2624fe5cf1553;hb=711f20225524f059da9296f814a06ab9332bb324;hpb=678f23ebb9d4b0f2ce713be2ce7bba9cb3c42bb5;ds=sidebyside

diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index da3d8b5..873b699 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -1,6 +1,12 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+
+set(QT_USE_QTDECLARATIVE 1)
+
+FIND_PACKAGE(Qt4 REQUIRED)
+
 INCLUDE(${QT_USE_FILE})
 
-INCLUDE_DIRECTORIES(../include ../plugins)
+INCLUDE_DIRECTORIES(${qtrapids_SOURCE_DIR}/src/include ${qtrapids_SOURCE_DIR}/src/plugins)
 
 FIND_LIBRARY(BOOST_SYSTEM boost_system-mt)
 IF(${BOOST_SYSTEM} STREQUAL BOOST_SYSTEM-NOTFOUND)
@@ -12,32 +18,48 @@ INCLUDE_DIRECTORIES(
    ${QT_QTTEST_INCLUDE_DIR}
    ${QT_QTDBUS}
    ${QT_QTGUI}
+   ${QT_QTDECLARATIVE_INCLUDE_DIR}
 )
 
 SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/proxy.cpp ${CMAKE_CURRENT_SOURCE_DIR}/proxy.h PROPERTIES GENERATED 1)
 
 SET(MOC_HEADERS
-  ./DownloadView.h
-  ./MainWindow.h
-  ./PreferencesDialog.h
-  ./proxy.h
-  ./SeedView.h
-  ./ColumnSelectorDialog.h
+    ./models/QDeclarativeDownloadListModel.h
+    ./models/QDeclarativeDownloadListModel_p.h
+#     ./DownloadView.h
+#     ./models/Plugin.h
+#   ./MainWindow.h
+#   ./PreferencesDialog.h
+#   ./proxy.h
+#   ./SeedView.h
+#   ./ColumnSelectorDialog.h
 )
 
 SET(SRC
-  ./DownloadView.cpp
-  ./main.cpp
-  ./MainWindow.cpp
-  ./PreferencesDialog.cpp
-  ./proxy.cpp
-  ./SeedView.cpp
-  ./ColumnSelectorDialog.cpp
+#     ./DownloadView.cpp
+    ./main.cpp
+    ./models/QDeclarativeDownloadListModel.cpp
+#   ./MainWindow.cpp
+#   ./PreferencesDialog.cpp
+#   ./proxy.cpp
+#   ./SeedView.cpp
+#   ./ColumnSelectorDialog.cpp
 )
 
+
+# Set the resource files to be used.
+# Add all .qrc files here, that are needed.
+SET(RCCS qml/qml.qrc)
+
+# generate rules for building source files from the resources
+QT4_ADD_RESOURCES(RCC_SRC ${RCCS})
+# generate rules for building source files that moc generates
+QT4_WRAP_CPP(QtApp_MOC_SRCS ${QtApp_MOCS})
+
 QT4_WRAP_CPP(SRC ${MOC_HEADERS})
-ADD_EXECUTABLE(qtrapids-gui ${SRC} ${MOC_HEADERS})
-INSTALL(TARGETS qtrapids-gui DESTINATION bin)
+# Build the executable from these files:
+ADD_EXECUTABLE(qml-client ${SRC} ${MOC_HEADERS}  ${RCC_SRC})
+INSTALL(TARGETS qml-client DESTINATION bin)
 
 ADD_DEFINITIONS(-DQT_SHARED)
 
@@ -54,17 +76,18 @@ if(NOT QT_QTMAEMO5_LIBRARY)
 endif(NOT QT_QTMAEMO5_LIBRARY)
 
 
-TARGET_LINK_LIBRARIES(qtrapids-gui
+TARGET_LINK_LIBRARIES(qml-client
   ${QT_QTGUI_LIBRARY} 
   ${QT_QTCORE_LIBRARY} 
   ${QT_QTDBUS_LIBRARY}
   ${QT_QTTEST_LIBRARY}
+  ${QT_QTDECLARATIVE_LIBRARY}
   -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})
+#set (SCRATCHBOX_UNAME $ENV{SBOX_UNAME_MACHINE})
 
 if (SCRATCHBOX_UNAME)
 	MESSAGE("Configuring for building under Scratchbox..")