diff options
| author | Olivier Tilloy <olivier.tilloy@canonical.com> | 2012-10-05 15:26:44 +0000 |
|---|---|---|
| committer | Tarmac <> | 2012-10-05 15:26:44 +0000 |
| commit | a03e7e775a9751f87efb8fd7acf226b5eb25f4e3 (patch) | |
| tree | 7ca7cfb2dd1e42c6c0d45918087c23fbf09dc5ae /tests/client/CMakeLists.txt | |
| parent | c3fbab270f60fc374bae50e787e0b2046f127a07 (diff) | |
| parent | 900b75e3528ea23b9158c52e43bca905a1ee5e5f (diff) | |
| download | qmenumodel-a03e7e775a9751f87efb8fd7acf226b5eb25f4e3.tar.gz qmenumodel-a03e7e775a9751f87efb8fd7acf226b5eb25f4e3.tar.bz2 qmenumodel-a03e7e775a9751f87efb8fd7acf226b5eb25f4e3.zip | |
Port to Qt5.
To compile and test, one needs to install the qt5-meta-minimal package from the Canonical Qt5 Edgers PPA (https://launchpad.net/~canonical-qt5-edgers/+archive/qt5-beta1). This installs Qt5 in /opt/qt5/. cmake needs to be invoked with CMAKE_PREFIX_PATH=/opt/qt5/lib/cmake, and /opt/qt5/bin needs to be added to $PATH if one wants to generate the API documentation using qdoc.. Approved by Renato Araujo Oliveira Filho, jenkins.
Diffstat (limited to 'tests/client/CMakeLists.txt')
| -rw-r--r-- | tests/client/CMakeLists.txt | 35 |
1 files changed, 10 insertions, 25 deletions
diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt index 2c48a07..7455b16 100644 --- a/tests/client/CMakeLists.txt +++ b/tests/client/CMakeLists.txt @@ -1,17 +1,12 @@ macro(declare_test testname)
- set(TEST_MOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/${testname}.moc)
- qt4_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}
@@ -25,18 +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)
- qt4_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})
@@ -47,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})
@@ -67,3 +51,4 @@ declare_test(menuchangestest) declare_test(modeltest)
declare_test(actiongrouptest)
declare_simple_test(convertertest)
+
|