Cleanup plugins CMake files

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index fee66b15847618564b04b1e7633967d1152fb111..79751e992f854fbbf85bd76bba3d6235228c5a79 100644 (file)
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -1,7 +1,3 @@
+include_directories(${CMAKE_SOURCE_DIR}/src)
 
-    INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src
-                        ${KDE4_INCLUDES}
-                        ${QT4_INCLUDES}
-                       )
-
-    ADD_SUBDIRECTORY(sampleplugin)
\ No newline at end of file
+add_subdirectory(sampleplugin)

diff --git a/plugins/sampleplugin/CMakeLists.txt b/plugins/sampleplugin/CMakeLists.txt
index 279aaec45b21716eafaf4fc18651c4472fac98ca..e9b0970a2f9593e33616d0e1e2c54f684e07ae9b 100644 (file)
--- a/plugins/sampleplugin/CMakeLists.txt
+++ b/plugins/sampleplugin/CMakeLists.txt
@@ -1,27 +1,30 @@
+set(QT_DONT_USE_QTGUI 0)
 
-include_directories (
-    ${CMAKE_SOURCE_DIR} 
-    ${CMAKE_BINARY_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${KDE4_INCLUDES}
-)
+add_definitions(${KDE4_DEFINITIONS})
 
-add_definitions( ${KDE4_DEFINITIONS} )
+include_directories(${KDE4_INCLUDES})
 
-#add_definitions (${QT_DEFINITIONS})
-ADD_DEFINITIONS(-DQT_PLUGIN)
-#ADD_DEFINITIONS(-DQT_NO_DEBUG)
-ADD_DEFINITIONS(-DQT_SHARED)
+include(${QT_USE_FILE})
 
-kde4_add_ui_files(plugin_UI countdown_ui.ui)
+#add_definitions(${QT_DEFINITIONS})
+#add_definitions(-DQT_NO_DEBUG)
+add_definitions(-DQT_PLUGIN)
+add_definitions(-DQT_SHARED)
 
-SET(sampleplugindir_SRCS
-        sampleplugin.cpp)
+SET(sampleplugin_SRCS sampleplugin.cpp)
 
-KDE4_ADD_PLUGIN(kdenlive_sampleplugin WITH_PREFIX ${sampleplugindir_SRCS} ${plugin_UI})
-#ADD_LIBRARY(kdenlive_sampleplugin SHARED ${sampleplugindir_SRCS})
+kde4_add_ui_files(sampleplugin_UIS countdown_ui.ui)
 
-TARGET_LINK_LIBRARIES(kdenlive_sampleplugin ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS})
+kde4_add_plugin(kdenlive_sampleplugin WITH_PREFIX
+  ${sampleplugin_SRCS}
+  ${sampleplugin_UIS}
+)
 
-INSTALL(TARGETS kdenlive_sampleplugin DESTINATION ${PLUGIN_INSTALL_DIR})
+target_link_libraries(kdenlive_sampleplugin
+  ${KDE4_KDECORE_LIBS}
+  ${KDE4_KDEUI_LIBS}
+  ${KDE4_KIO_LIBS}
+  ${QT_LIBRARIES}
+)
 
+install(TARGETS kdenlive_sampleplugin DESTINATION ${PLUGIN_INSTALL_DIR})