diff options
author | Brad King <brad.king@kitware.com> | 2013-03-13 17:34:24 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-03-13 17:34:24 (GMT) |
commit | 26bfece1af0e3b06778e56eddd9cdd1f448a5c77 (patch) | |
tree | 4f02773d060565a5e40f1a40ab5d5e0a49cae7fd /Tests/CMakeLists.txt | |
parent | 9a02a267021b4bced796ac73e1a69fd095883d15 (diff) | |
parent | a223a3b65f518f59a73967f0087b0d67842d9f0d (diff) | |
download | CMake-26bfece1af0e3b06778e56eddd9cdd1f448a5c77.zip CMake-26bfece1af0e3b06778e56eddd9cdd1f448a5c77.tar.gz CMake-26bfece1af0e3b06778e56eddd9cdd1f448a5c77.tar.bz2 |
Merge topic 'fix-automoc-no-qt'
a223a3b Automoc: Don't create automoc targets if Qt is not used (#13999)
65b5c1e Merge branch 'property-link-depends-no-crash' into fix-automoc-no-qt
Diffstat (limited to 'Tests/CMakeLists.txt')
-rw-r--r-- | Tests/CMakeLists.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 8c7b87c..5982e8b 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -993,6 +993,16 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/ ) list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Environment") + add_test(QtAutomocNoQt ${CMAKE_CTEST_COMMAND} + --build-and-test + "${CMake_SOURCE_DIR}/Tests/QtAutomocNoQt" + "${CMake_BINARY_DIR}/Tests/QtAutomocNoQt" + ${build_generator_args} + --build-project QtAutomocNoQt + --build-options -DCMAKE_BUILD_TYPE=\${CTEST_CONFIGURATION_TYPE} + ) + list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/QtAutomocNoQt") + if(QT4_WORKS AND QT_QTGUI_FOUND) add_test(QtAutomoc ${CMAKE_CTEST_COMMAND} --build-and-test |