diff options
| author | Brad King <brad.king@kitware.com> | 2014-02-04 13:34:54 -0500 |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-02-04 13:34:54 -0500 |
| commit | f748b59e2057d73a25448378442d70b420ed7698 (patch) | |
| tree | 0035234f8941db728f48c6485da9e5575aa34fbc /Tests/CMakeLists.txt | |
| parent | 01a41bc98ca8f2451e69fde4ac513b57276809ff (diff) | |
| parent | 6053ce22f69f58c9dc4db66dbfe62cdd8fbe2774 (diff) | |
| download | cmake-f748b59e2057d73a25448378442d70b420ed7698.tar.gz | |
Merge topic 'fix-Qt-autogen'
6053ce22 QtAutogen: Make uic work even when the source is in a subdir.
1fc9ecfa FindQt4: Make AUTOMOC work regardless which order Qt 4/5 is found.
Diffstat (limited to 'Tests/CMakeLists.txt')
| -rw-r--r-- | Tests/CMakeLists.txt | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 2807f973c8..1e04f2f972 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -1191,6 +1191,18 @@ ${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/Qt4And5Automoc") + add_test(Qt4And5AutomocReverse ${CMAKE_CTEST_COMMAND} + --build-and-test + "${CMake_SOURCE_DIR}/Tests/Qt4And5Automoc" + "${CMake_BINARY_DIR}/Tests/Qt4And5AutomocReverse" + ${build_generator_args} + --build-project Qt4And5Automoc + --build-exe-dir "${CMake_BINARY_DIR}/Tests/Qt4And5AutomocReverse" + --force-new-ctest-process + --build-options ${build_options} -DQT_REVERSE_FIND_ORDER=1 + --test-command ${CMAKE_CTEST_COMMAND} -V + ) + list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4And5AutomocReverse") endif() endif() |