Fix logic which decides when to execute automoc test
Alex
This commit is contained in:
parent
77a5c6e0d8
commit
2963d0b078
|
@ -842,6 +842,8 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
|
||||||
|
|
||||||
IF(NOT QT4_FOUND)
|
IF(NOT QT4_FOUND)
|
||||||
FIND_PACKAGE(Qt4)
|
FIND_PACKAGE(Qt4)
|
||||||
|
ENDIF(NOT QT4_FOUND)
|
||||||
|
|
||||||
IF(QT4_FOUND)
|
IF(QT4_FOUND)
|
||||||
ADD_TEST(QtAutomoc ${CMAKE_CTEST_COMMAND}
|
ADD_TEST(QtAutomoc ${CMAKE_CTEST_COMMAND}
|
||||||
--build-and-test
|
--build-and-test
|
||||||
|
@ -856,7 +858,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
|
||||||
)
|
)
|
||||||
LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/QtAutomoc")
|
LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/QtAutomoc")
|
||||||
ENDIF()
|
ENDIF()
|
||||||
ENDIF(NOT QT4_FOUND)
|
|
||||||
|
|
||||||
ADD_TEST(ExternalProject ${CMAKE_CTEST_COMMAND}
|
ADD_TEST(ExternalProject ${CMAKE_CTEST_COMMAND}
|
||||||
--build-and-test
|
--build-and-test
|
||||||
|
|
Loading…
Reference in New Issue