diff options
| author | Alex Neundorf <neundorf@kde.org> | 2011-08-16 21:48:01 (GMT) |
|---|---|---|
| committer | Alex Neundorf <neundorf@kde.org> | 2011-08-16 21:48:01 (GMT) |
| commit | 2963d0b078bf9302cab37d9def16776bde45dd67 (patch) | |
| tree | 6221834a79fcf842bb88eb46a292d25f54f641fb | |
| parent | 77a5c6e0d8c995f56fa1248443de0260384acca3 (diff) | |
| download | CMake-2963d0b078bf9302cab37d9def16776bde45dd67.zip CMake-2963d0b078bf9302cab37d9def16776bde45dd67.tar.gz CMake-2963d0b078bf9302cab37d9def16776bde45dd67.tar.bz2 | |
Fix logic which decides when to execute automoc test
Alex
| -rw-r--r-- | Tests/CMakeLists.txt | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 30549b6..7bf4ddb 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -842,22 +842,23 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/ IF(NOT QT4_FOUND) FIND_PACKAGE(Qt4) - IF(QT4_FOUND) - ADD_TEST(QtAutomoc ${CMAKE_CTEST_COMMAND} - --build-and-test - "${CMake_SOURCE_DIR}/Tests/QtAutomoc" - "${CMake_BINARY_DIR}/Tests/QtAutomoc" - --build-generator ${CMAKE_TEST_GENERATOR} - --build-project QtAutomoc - --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM} - --build-exe-dir "${CMake_BINARY_DIR}/Tests/QtAutomoc" - --force-new-ctest-process - --test-command ${CMAKE_CTEST_COMMAND} -V - ) - LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/QtAutomoc") - ENDIF() ENDIF(NOT QT4_FOUND) + IF(QT4_FOUND) + ADD_TEST(QtAutomoc ${CMAKE_CTEST_COMMAND} + --build-and-test + "${CMake_SOURCE_DIR}/Tests/QtAutomoc" + "${CMake_BINARY_DIR}/Tests/QtAutomoc" + --build-generator ${CMAKE_TEST_GENERATOR} + --build-project QtAutomoc + --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM} + --build-exe-dir "${CMake_BINARY_DIR}/Tests/QtAutomoc" + --force-new-ctest-process + --test-command ${CMAKE_CTEST_COMMAND} -V + ) + LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/QtAutomoc") + ENDIF() + ADD_TEST(ExternalProject ${CMAKE_CTEST_COMMAND} --build-and-test "${CMake_SOURCE_DIR}/Tests/ExternalProject" |