diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-18 12:01:55 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-01-18 12:02:01 (GMT) |
| commit | a61c061b6143cb6d8920b1b5796a867c0f104556 (patch) | |
| tree | 41e3f385209dbfd50560fd332b41f657eb159c34 /Tests/CMakeLists.txt | |
| parent | 65a3abf999b30117447c2e62581fbcaec56aadd9 (diff) | |
| parent | 1c08652580ce3641f38f173074215bb12705ce63 (diff) | |
| download | CMake-a61c061b6143cb6d8920b1b5796a867c0f104556.zip CMake-a61c061b6143cb6d8920b1b5796a867c0f104556.tar.gz CMake-a61c061b6143cb6d8920b1b5796a867c0f104556.tar.bz2 | |
Merge topic 'automoc-test-in-place'
1c08652580 Tests: Fix Qt4And5Automoc tests to work on in-source build
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2817
Diffstat (limited to 'Tests/CMakeLists.txt')
| -rw-r--r-- | Tests/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index d78811d..7338993 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -1362,18 +1362,18 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release 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} + add_test(Qt4And5AutomocForward ${CMAKE_CTEST_COMMAND} --build-and-test "${CMake_SOURCE_DIR}/Tests/Qt4And5Automoc" - "${CMake_BINARY_DIR}/Tests/Qt4And5Automoc" + "${CMake_BINARY_DIR}/Tests/Qt4And5AutomocForward" ${build_generator_args} --build-project Qt4And5Automoc - --build-exe-dir "${CMake_BINARY_DIR}/Tests/Qt4And5Automoc" + --build-exe-dir "${CMake_BINARY_DIR}/Tests/Qt4And5AutomocForward" --force-new-ctest-process --build-options ${build_options} --test-command ${CMAKE_CTEST_COMMAND} -V ) - list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4And5Automoc") + list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4And5AutomocForward") add_test(Qt4And5AutomocReverse ${CMAKE_CTEST_COMMAND} --build-and-test "${CMake_SOURCE_DIR}/Tests/Qt4And5Automoc" |