Fixes: CMake cleanup and fixes

siraj · Aug 21, 2011 · 7b47740 · 7b47740
1 parent bf2b27f
commit 7b47740
Show file tree

Hide file tree

Showing 52 changed files with 117 additions and 458 deletions.
diff --git a/3rdparty/mime/CMakeLists.txt b/3rdparty/mime/CMakeLists.txt
@@ -4,13 +4,6 @@ IF(CMAKE_BUILD_TYPE MATCHES ".*Deb.*")
 ENDIF(CMAKE_BUILD_TYPE MATCHES ".*Deb.*")
 
 
-INCLUDE_DIRECTORIES(
-    ${QT_INCLUDES}
-    ${QT_QTNETWORK_INCLUDE_DIR}
-    ${QT_QTXML_INCLUDE_DIR}
-    ${QT_QTTEST_INCLUDE_DIR}
-    )
-
 SET (sourceFiles
     freedesktopmime.cpp
     )

diff --git a/3rdparty/mime/test/CMakeLists.txt b/3rdparty/mime/test/CMakeLists.txt
@@ -1,8 +1,3 @@
-INCLUDE_DIRECTORIES(
-    ${QT_INCLUDES}
-    ${QT_QTXMLPATTERNS_INCLUDE_DIR}
-    )
-
 SET(sourceFiles
     test.cpp
     )

diff --git a/3rdparty/qplexymime/CMakeLists.txt b/3rdparty/qplexymime/CMakeLists.txt
@@ -4,11 +4,6 @@ IF(CMAKE_BUILD_TYPE MATCHES ".*Deb.*")
 ENDIF(CMAKE_BUILD_TYPE MATCHES ".*Deb.*")
 
 
-INCLUDE_DIRECTORIES(
-    ${QT_INCLUDES}
-    ${QT_QTXMLPATTERNS_INCLUDE_DIR}
-    )
-
 SET(resourceFiles
     qplexymime.qrc
     )

diff --git a/3rdparty/qplexymime/test/CMakeLists.txt b/3rdparty/qplexymime/test/CMakeLists.txt
@@ -1,8 +1,3 @@
-INCLUDE_DIRECTORIES(
-    ${QT_INCLUDES}
-    ${QT_QTXMLPATTERNS_INCLUDE_DIR}
-    )
-
 SET(sourceFiles
     test.cpp
     testmime.cpp

diff --git a/3rdparty/webitem/lib/CMakeLists.txt b/3rdparty/webitem/lib/CMakeLists.txt
@@ -1,7 +1,3 @@
-INCLUDE_DIRECTORIES(
-    ${QT_INCLUDES}
-    )
-
 SET(sourceFiles
     qwebviewitem.cpp
     )
@@ -39,8 +35,7 @@ SET(libs
     ${QT_QTSVG_LIBRARY}
     )
 
-TARGET_LINK_LIBRARIES(
-    webqgv
+TARGET_LINK_LIBRARIES(webqgv
     ${libs}
     )
 

diff --git a/3rdparty/webitem/src/CMakeLists.txt b/3rdparty/webitem/src/CMakeLists.txt
@@ -1,9 +1,5 @@
 INCLUDE_DIRECTORIES(
     ${WEBKIT_TRUNK}/WebKit/qt/Api
-    ${QT_INCLUDES}
-    ${QT_QTOPENGL_INCLUDE_DIR}
-    ${QT_QTNETWORK_INCLUDE_DIR}
-    ${QT_QTTEST_INCLUDE_DIR}
     ${X11_INCLUDE_DIR}
     )
 
@@ -21,8 +17,7 @@ ADD_EXECUTABLE(stefani ${stefani_PART_SRCS})
 
 LINK_DIRECTORIES(${WEBKIT_TRUNK}/WebKitBuild/${MODE}/lib)
 
-TARGET_LINK_LIBRARIES(
-    stefani
+TARGET_LINK_LIBRARIES(stefani
     webqgv
     QtWebKit.so
     )

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -27,7 +27,7 @@ CMAKE_POLICY(SET CMP0003 OLD)
 SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmakemodules)
 
 # Needed/optional packages definitions
-FIND_PACKAGE(Qt4 4.7.0 REQUIRED)
+FIND_PACKAGE(Qt4 4.7.0  COMPONENTS QtCore QtGui QtOpenGL QtXml QtDeclarative QSql QSvg REQUIRED)
 FIND_PACKAGE(FFMPEG) #optional
 FIND_PACKAGE(OpenCV) #optional
 FIND_PACKAGE(QImageBlitz REQUIRED)
@@ -81,6 +81,18 @@ INCLUDE(GNUInstallDirs)
 # Set all flags first and then use the QT_USE_FILE to set everything.
 # Note that QT_USE_FILE also sets QT_DEFINITIONS
 SET(QT_USE_OPENGL TRUE)
+SET(QT_USE_QTMAIN TRUE)
+#SET(QT_USE_QTMULTIMEDIA TRUE)
+SET(QT_USE_QTNETWORK TRUE)
+SET(QT_USE_QTXML TRUE)
+SET(QT_USE_QTSVG TRUE)
+SET(QT_USE_QTSQL TRUE)
+SET(QT_USE_QTTEST TRUE)
+SET(QT_USE_QTDBUS TRUE)
+SET(QT_USE_QTWEBKIT TRUE)
+SET(QT_USE_QTXMLPATTERNS TRUE)
+SET(QT_USE_QTSCRIPT TRUE)
+SET(QT_USE_QTDECLARATIVE TRUE)
 INCLUDE(${QT_USE_FILE})
 
 SET(QT_IMPORTS_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/qt4/imports)
@@ -213,6 +225,7 @@ ENDIF(WIN32)
 # *** ALL PLATFORMS ***
 ADD_SUBDIRECTORY(3rdparty/mime)
 ADD_SUBDIRECTORY(3rdparty/qplexymime)
+#ADD_SUBDIRECTORY(3rdparty/qt/src/imports/folderlistmodel)
 ADD_SUBDIRECTORY(3rdparty/webitem)
 ADD_SUBDIRECTORY(base/qt4)
 ADD_SUBDIRECTORY(extensions/widgets/clock)

diff --git a/artwork/themepacks/default/folderview/folderview.qml b/artwork/themepacks/default/folderview/folderview.qml
@@ -20,7 +20,7 @@
 
 import Qt 4.7
 import Qt.labs.folderlistmodel 1.0
-import FolderView 1.0
+import PlexyDesk.FolderView 1.0
 import "resources"
 import "resources/Scripts.js" as Scripts
 

diff --git a/base/qt4/CMakeLists.txt b/base/qt4/CMakeLists.txt
@@ -1,10 +1,3 @@
-INCLUDE_DIRECTORIES(
-    ${QT_INCLUDES}
-    ${QT_QTOPENGL_INCLUDE_DIR}
-    ${QT_QTNETWORK_INCLUDE_DIR}
-    ${QT_QTTEST_INCLUDE_DIR}
-    )
-
 SET(sourceFiles
     abstractplugininterface.cpp
     backdropinterface.cpp
@@ -120,8 +113,7 @@ IF(MINGW)
         )
 ENDIF(MINGW)
 
-TARGET_LINK_LIBRARIES(
-    ${PLEXY_CORE_LIBRARY}
+TARGET_LINK_LIBRARIES(${PLEXY_CORE_LIBRARY}
     ${libs}
     )
 

diff --git a/base/qt4/baserender.cpp b/base/qt4/baserender.cpp
@@ -16,13 +16,14 @@
 *  You should have received a copy of the GNU General Public License
 *  along with PlexyDesk. If not, see <http://www.gnu.org/licenses/lgpl.html>
 *******************************************************************************/
-#include "baserender.h"
 
 #include <QPaintEvent>
 #include <QPainter>
 #include <QtCore/QtGlobal>
 #include <QtOpenGL>
 
+#include "baserender.h"
+
 #ifdef Q_WS_WIN
 #define GL_MULTISAMPLE 0x809D
 #endif

diff --git a/base/qt4/shaders/CMakeLists.txt b/base/qt4/shaders/CMakeLists.txt
@@ -1,7 +1,3 @@
-INCLUDE_DIRECTORIES(
-    ${QT_INCLUDES}
-    )
-
 SET(sourceFiles
     shadereffect.cpp
     shadereffectbuffer.cpp
@@ -42,8 +38,7 @@ IF(MINGW)
         )
 ENDIF(MINGW)
 
-TARGET_LINK_LIBRARIES(
-    plexyshaders
+TARGET_LINK_LIBRARIES(plexyshaders
     ${QT_QTSCRIPT_LIBRARY}
     ${QT_QTWEBKIT_LIBRARY}
     ${QT_QTGUI_LIBRARY}

diff --git a/cmakemodules/package_messages.sh.in b/cmakemodules/package_messages.sh.in
@@ -36,7 +36,7 @@ for subdir in $dirs; do
   (cd $subdir
    echo -e 'i18n("_: NAME OF TRANSLATORS\\n"\n"Your names")\ni18n("_: EMAIL OF TRANSLATORS\\n"\n"Your emails")' > _translatorinfo.cpp
    $EXTRACTRC `find . -name \*.ui -o -name \*.rc` > rc.cpp
-   XGETTEXT="${XGETTEXT:-xgettext} -C -ki18n -ktr2i18n -kI18N_NOOP -ktranslate -kaliasLocale -x @KDE3_INCLUDE_DIR@/kde.pot"
+   XGETTEXT="${XGETTEXT:-xgettext} -C -ki18n -ktr2i18n -kI18N_NOOP -ktranslate -kaliasLocale -x @KDE4_INCLUDE_DIR@/kde.pot"
    find . -name '*.cpp' | xargs ${XGETTEXT} _translatorinfo.cpp -o ${podir}/@PROJECT_NAME@.pot
    find . -name '*.ui.h' | xargs ${XGETTEXT} _translatorinfo.cpp -j -o ${podir}/@PROJECT_NAME@.pot
    ) 2>&1 | grep -v '^make\[1\]' > $tmpname

diff --git a/extensions/backdrop/classicdrop/CMakeLists.txt b/extensions/backdrop/classicdrop/CMakeLists.txt
@@ -1,12 +1,3 @@
-PROJECT(classicbackdrop)
-
-INCLUDE_DIRECTORIES(
-    ${QT_INCLUDES}
-    ${QT_QTOPENGL_INCLUDE_DIR}
-    ${QT_QTNETWORK_INCLUDE_DIR}
-    ${QT_QTTEST_INCLUDE_DIR}
-    )
-
 SET(sourceFiles
     backdrop.cpp
     classicinterface.cpp
@@ -46,8 +37,7 @@ IF(MINGW)
         )
 ENDIF(MINGW)
 
-TARGET_LINK_LIBRARIES(
-    classicbackdrop
+TARGET_LINK_LIBRARIES(classicbackdrop
     ${PLEXY_CORE_LIBRARY}
     ${libs}
     )

diff --git a/extensions/data/cvwebcam/CMakeLists.txt b/extensions/data/cvwebcam/CMakeLists.txt
@@ -1,8 +1,4 @@
 INCLUDE_DIRECTORIES(
-    ${QT_INCLUDES}
-    ${QT_QTOPENGL_INCLUDE_DIR}
-    ${QT_QTNETWORK_INCLUDE_DIR}
-    ${QT_QTTEST_INCLUDE_DIR}
     ${OPENCV_INCLUDE_DIR}
     )
 
@@ -39,8 +35,7 @@ SET(libs
 
 ADD_LIBRARY(webcamengine SHARED ${sourceFiles} ${QT_MOC_SRCS})
 
-TARGET_LINK_LIBRARIES(
-    webcamengine
+TARGET_LINK_LIBRARIES(webcamengine
     ${PLEXY_CORE_LIBRARY}
     ${libs}
     )

diff --git a/extensions/data/example/CMakeLists.txt b/extensions/data/example/CMakeLists.txt
@@ -1,39 +1,28 @@
-INCLUDE_DIRECTORIES(
-	   ${QT_INCLUDES}
-	   ${QT_QTOPENGL_INCLUDE_DIR}
-	   ${QT_QTNETWORK_INCLUDE_DIR}
-	   ${QT_QTTEST_INCLUDE_DIR}
-		 )
-
 SET(exampleenginesrc
     example.cpp
     exampleinterface.cpp
-		)
+    )
 
 SET(plexicore_MOC
-    ${CMAKE_SOURCE_DIR}/plexycore/qt4/pluginloader.cpp
-    ${CMAKE_SOURCE_DIR}/plexycore/qt4/abstractplugininterface.cpp
-    ${CMAKE_SOURCE_DIR}/plexycore/qt4/dataplugin.cpp
-    ${CMAKE_SOURCE_DIR}/plexycore/qt4/baseplugin.cpp
+    ${CMAKE_SOURCE_DIR}/base/qt4/pluginloader.cpp
+    ${CMAKE_SOURCE_DIR}/base/qt4/abstractplugininterface.cpp
+    ${CMAKE_SOURCE_DIR}/base/qt4/dataplugin.cpp
+    ${CMAKE_SOURCE_DIR}/base/qt4/baseplugin.cpp
     )
 
 QT4_AUTOMOC(${plexicore_MOC})
 
 ADD_LIBRARY(exampleengine SHARED ${exampleenginesrc} ${plexicore_MOC})
 QT4_AUTOMOC(${exampleenginesrc})
 
-#SET_TARGET_PROPERTIES(plexy PROPERTIES
-#                      COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS})
-
-TARGET_LINK_LIBRARIES(
-	       exampleengine
-	       qtviz
-	       ${QT_QTGUI_LIBRARY}
-	       ${OPENGL_LIBRARIES}
-	       ${QT_QTCORE_LIBRARY}
-	       ${QT_QTNETWORK_LIBRARY}
-	       ${QT_QTOPENGL_LIBRARY}
-       )
+TARGET_LINK_LIBRARIES(exampleengine
+    qtviz
+    ${QT_QTGUI_LIBRARY}
+    ${OPENGL_LIBRARIES}
+    ${QT_QTCORE_LIBRARY}
+    ${QT_QTNETWORK_LIBRARY}
+    ${QT_QTOPENGL_LIBRARY}
+    )
 
 INSTALL(TARGETS exampleengine DESTINATION ${CMAKE_INSTALL_LIBDIR}/plexyext)
 INSTALL(FILES example.desktop DESTINATION share/plexy/ext/groups)
diff --git a/extensions/data/flicker/CMakeLists.txt b/extensions/data/flicker/CMakeLists.txt
@@ -1,10 +1,3 @@
-INCLUDE_DIRECTORIES(
-	   ${QT_INCLUDES}
-	   ${QT_QTOPENGL_INCLUDE_DIR}
-	   ${QT_QTNETWORK_INCLUDE_DIR}
-	   ${QT_QTTEST_INCLUDE_DIR}
-	   )
-
 SET(sourceFiles
     flicker.cpp
     flickerinterface.cpp
@@ -37,10 +30,9 @@ SET(libs
 
 ADD_LIBRARY(flickerengine SHARED ${sourceFiles} ${QT_MOC_SRCS})
 
-TARGET_LINK_LIBRARIES(
-	flickerengine
-	${PLEXY_CORE_LIBRARY}
-	${libs}
+TARGET_LINK_LIBRARIES(flickerengine
+        ${PLEXY_CORE_LIBRARY}
+        ${libs}
 )
 
 INSTALL(TARGETS flickerengine DESTINATION ${CMAKE_INSTALL_LIBDIR}/plexyext)

diff --git a/extensions/data/irc/CMakeLists.txt b/extensions/data/irc/CMakeLists.txt
@@ -1,10 +1,3 @@
-INCLUDE_DIRECTORIES(
-	${QT_INCLUDES}
-	${QT_QTOPENGL_INCLUDE_DIR}
-	${QT_QTNETWORK_INCLUDE_DIR}
-	${QT_QTTEST_INCLUDE_DIR}
-	)
-
 SET(sourceFiles
     ircengine.cpp
     ircengineinterface.cpp
@@ -37,8 +30,7 @@ SET(libs
 
 ADD_LIBRARY(ircengine SHARED ${sourceFiles} ${QT_MOC_SRCS})
 
-TARGET_LINK_LIBRARIES(
-    ircengine
+TARGET_LINK_LIBRARIES(ircengine
     qtviz
     ${libs}
     )

diff --git a/extensions/data/localphotos/CMakeLists.txt b/extensions/data/localphotos/CMakeLists.txt
@@ -1,33 +1,20 @@
-INCLUDE_DIRECTORIES(
-	   ${QT_INCLUDES}
-	   ${QT_QTOPENGL_INCLUDE_DIR}
-	   ${QT_QTNETWORK_INCLUDE_DIR}
-	   ${QT_QTTEST_INCLUDE_DIR}
-		 )
-
 SET (localphotosenginesrc
     localphotos.cpp
     localphotosinterface.cpp
-		)
+    )
 
 SET (plexicore_MOC
-    ${CMAKE_SOURCE_DIR}/plexycore/qt4/pluginloader.cpp
-    ${CMAKE_SOURCE_DIR}/plexycore/qt4/abstractplugininterface.cpp
-    ${CMAKE_SOURCE_DIR}/plexycore/qt4/dataplugin.cpp
-    ${CMAKE_SOURCE_DIR}/plexycore/qt4/baseplugin.cpp
+    ${CMAKE_SOURCE_DIR}/base/qt4/pluginloader.cpp
+    ${CMAKE_SOURCE_DIR}/base/qt4/abstractplugininterface.cpp
+    ${CMAKE_SOURCE_DIR}/base/qt4/dataplugin.cpp
+    ${CMAKE_SOURCE_DIR}/base/qt4/baseplugin.cpp
     )
 
-QT4_AUTOMOC(${plexicore_MOC})
+QT4_AUTOMOC(${plexicore_MOC} ${localphotosenginesrc})
 
 ADD_LIBRARY(localphotosengine SHARED ${localphotosenginesrc} ${plexicore_MOC})
-QT4_AUTOMOC(${localphotosenginesrc})
-
-#SET_TARGET_PROPERTIES(plexy PROPERTIES
-#                      COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS})
-
 
-TARGET_LINK_LIBRARIES(
-    localphotosengine
+TARGET_LINK_LIBRARIES(localphotosengine
     qtviz
     ${QT_QTGUI_LIBRARY}
     ${OPENGL_LIBRARIES}

diff --git a/extensions/data/presence/CMakeLists.txt b/extensions/data/presence/CMakeLists.txt
@@ -1,10 +1,6 @@
 FIND_PACKAGE(TelepathyQt4)
 
 INCLUDE_DIRECTORIES(
-    ${QT_INCLUDES}
-    ${QT_QTOPENGL_INCLUDE_DIR}
-    ${QT_QTNETWORK_INCLUDE_DIR}
-    ${QT_QTTEST_INCLUDE_DIR}
     ${TELEPATHY_QT4_INCLUDE_DIR}
     )
 
@@ -41,8 +37,7 @@ SET(libs
 
 ADD_LIBRARY(presenceengine SHARED ${sourceFiles} ${QT_MOC_SRCS})
 
-TARGET_LINK_LIBRARIES(
-    presenceengine
+TARGET_LINK_LIBRARIES(presenceengine
     qtviz
     ${libs}
     )