diff options
| author | Brad King <brad.king@kitware.com> | 2013-06-03 13:57:01 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-06-03 13:57:01 (GMT) |
| commit | 6d4e79e2c361084ae26a8961ac9936052d68fde9 (patch) | |
| tree | 574a61a9c45764f2e1d267ec09f8d38454c9b6a8 /Tests/CMakeLists.txt | |
| parent | 3caf565d079af73f0ea8aaa7b6f4f212e0fcb15d (diff) | |
| parent | fa55751f83dc5d5bd5f80d12c3076ec703262edb (diff) | |
| download | CMake-6d4e79e2c361084ae26a8961ac9936052d68fde9.zip CMake-6d4e79e2c361084ae26a8961ac9936052d68fde9.tar.gz CMake-6d4e79e2c361084ae26a8961ac9936052d68fde9.tar.bz2 | |
Merge topic 'qt4-qt5-CMAKE_AUTOMOC'
fa55751 QtAutomoc: Get the Qt version through the target link interface
f776316 Use the qt5::moc imported target instead of a variable.
Diffstat (limited to 'Tests/CMakeLists.txt')
| -rw-r--r-- | Tests/CMakeLists.txt | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index fe9a5f5..cd562c2 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -1044,6 +1044,20 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/ --test-command ${CMAKE_CTEST_COMMAND} -V ) list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Targets") + + if(Qt5Widgets_FOUND AND NOT Qt5Widgets_VERSION VERSION_LESS 5.1.0) + add_test(Qt4And5Automoc ${CMAKE_CTEST_COMMAND} + --build-and-test + "${CMake_SOURCE_DIR}/Tests/Qt4And5Automoc" + "${CMake_BINARY_DIR}/Tests/Qt4And5Automoc" + ${build_generator_args} + --build-project Qt4And5Automoc + --build-exe-dir "${CMake_BINARY_DIR}/Tests/Qt4And5Automoc" + --force-new-ctest-process + --test-command ${CMAKE_CTEST_COMMAND} -V + ) + list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4And5Automoc") + endif() endif() add_test(ExternalProject ${CMAKE_CTEST_COMMAND} |