From 82677d03e4ec89ea4387467bcf7caa954a5ae183 Mon Sep 17 00:00:00 2001
From: Olivier Tilloy <olivier.tilloy@canonical.com>
Date: Fri, 5 Oct 2012 15:13:34 +0200
Subject: Use the automoc feature to simplify a lot the build system.

---
 tests/client/CMakeLists.txt | 32 +++++++-------------------------
 tests/script/CMakeLists.txt | 30 +-----------------------------
 2 files changed, 8 insertions(+), 54 deletions(-)

(limited to 'tests')

diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt
index e9de735..7455b16 100644
--- a/tests/client/CMakeLists.txt
+++ b/tests/client/CMakeLists.txt
@@ -1,18 +1,12 @@
 macro(declare_test testname)
-    set(TEST_MOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/${testname}.moc)
-    qt5_generate_moc(${testname}.cpp ${TEST_MOC_FILE})
-
-    add_executable(${testname} ${testname}.cpp ${TEST_MOC_FILE})
+    add_executable(${testname} ${testname}.cpp)
     qt5_use_modules(${testname} Core DBus Widgets Test)
     target_link_libraries(${testname}
                           qmenumodel
                           dbusmenuscript
-                          ${QT_QTTEST_LIBRARY}
-                          ${QT_QTCORE_LIBRARY}
-                          ${QT_QTGUI_LIBRARY}
-                          ${QT_QTDBUS_LIBRARY}
                           ${GLIB_LDFLAGS}
-                          ${GIO_LDFLAGS})
+                          ${GIO_LDFLAGS}
+    )
 
     add_test(${testname}
              ${DBUS_RUNNER}
@@ -26,19 +20,13 @@ macro(declare_test testname)
 endmacro(declare_test testname)
 
 macro(declare_simple_test testname)
-    set(TEST_MOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/${testname}.moc)
-    qt5_generate_moc(${testname}.cpp ${TEST_MOC_FILE})
-
-    add_executable(${testname} ${testname}.cpp ${TEST_MOC_FILE})
+    add_executable(${testname} ${testname}.cpp)
     qt5_use_modules(${testname} Core Test)
     target_link_libraries(${testname}
                           qmenumodel
-                          ${QT_QTTEST_LIBRARY}
-                          ${QT_QTCORE_LIBRARY}
-                          ${QT_QTGUI_LIBRARY}
-                          ${QT_QTDBUS_LIBRARY}
                           ${GLIB_LDFLAGS}
-                          ${GIO_LDFLAGS})
+                          ${GIO_LDFLAGS}
+    )
 
     add_test(${testname}
              ${CMAKE_CURRENT_BINARY_DIR}/${testname})
@@ -49,14 +37,8 @@ endmacro(declare_simple_test testname)
 
 include_directories(${src_SOURCE_DIR}
                     ${dbusmenuscript_SOURCE_DIR}
-                    ${CMAKE_CURRENT_BINARY_DIR}
-                    ${QT_INCLUDE_DIR}
-                    ${QT_QTTEST_INCLUDE_DIR}
-                    ${QT_QTCORE_INCLUDE_DIR}
-                    ${QT_QTGUI_INCLUDE_DIR}
-                    ${QT_QTDBUS_INCLUDE_DIR}
                     ${GLIB_INCLUDE_DIRS}
-                    ${GIO_INCLUDE_DIRS})
+)
 
 add_definitions(-DTEST_SUITE)
 set(TEST_PYTHONPATH ${dbusmenuscript_SOURCE_DIR})
diff --git a/tests/script/CMakeLists.txt b/tests/script/CMakeLists.txt
index bf415f5..afa073b 100644
--- a/tests/script/CMakeLists.txt
+++ b/tests/script/CMakeLists.txt
@@ -1,36 +1,8 @@
 project(dbusmenuscript)
 
-set(DBUSMENUSCRIPT_SRC
-    dbusmenuscript.cpp
-)
-
-set(DBUSMENUSCRIPT_HEADERS
-    dbusmenuscript.h
-)
-
-qt5_wrap_cpp(DBUSMENUSCRIPT_MOC
-    ${DBUSMENUSCRIPT_HEADERS}
-)
-
-add_library(dbusmenuscript STATIC
-    ${DBUSMENUSCRIPT_SRC}
-    ${DBUSMENUSCRIPT_MOC}
-)
+add_library(dbusmenuscript STATIC dbusmenuscript.cpp)
 
 set_target_properties(dbusmenuscript PROPERTIES COMPILE_FLAGS -fPIC)
 
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${QT_INCLUDE_DIR}
-    ${QT_QTTEST_INCLUDE_DIR}
-    ${QT_QTCORE_INCLUDE_DIR}
-    ${QT_QTDBUS_INCLUDE_DIR}
-)
-
 qt5_use_modules(dbusmenuscript Core DBus Test)
 
-target_link_libraries(dbusmenuscript
-    ${QT_QTCORE_LIBRARY}
-    ${QT_QTTEST_LIBRARY}
-    ${QT_QTDBUS_LIBRARY}
-)
-- 
cgit v1.2.3