diff options
| author | Stephen Kelly <steveire@gmail.com> | 2014-01-29 15:57:09 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2014-01-29 16:02:43 (GMT) |
| commit | 1fc9ecfae63447f9109475c1b1ffb6a2974458d9 (patch) | |
| tree | 32444c6c60e89313a9af07e8e4ca3ce8c9f9bda9 /Tests/CMakeLists.txt | |
| parent | f7ae1d8ad6d0db2b6656ed77f7de12189badf05c (diff) | |
| download | CMake-1fc9ecfae63447f9109475c1b1ffb6a2974458d9.zip CMake-1fc9ecfae63447f9109475c1b1ffb6a2974458d9.tar.gz CMake-1fc9ecfae63447f9109475c1b1ffb6a2974458d9.tar.bz2 | |
FindQt4: Make AUTOMOC work regardless which order Qt 4/5 is found.
Commit 321e348e (QtAutogen: Use Qt 4 IMPORTED targets to find
executable locations., 2014-01-24) attempted to fix this problem,
but only solved it for a particular ordering of find_package for
Qt 4 and Qt 5.
Add a test to ensure that it works with both orderings.
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 a79111a..60dc688 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -1168,6 +1168,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() |