Rename the QtAutomoc tests to QtAutogen.

This commit is contained in:
Stephen Kelly 2013-10-11 14:17:32 +02:00
parent 7ce65c3c97
commit e485ba1219
37 changed files with 13 additions and 13 deletions

View File

@ -1031,32 +1031,32 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
find_package(Qt5Widgets QUIET NO_MODULE) find_package(Qt5Widgets QUIET NO_MODULE)
if(Qt5Widgets_FOUND) if(Qt5Widgets_FOUND)
add_test(Qt5Automoc ${CMAKE_CTEST_COMMAND} add_test(Qt5Autogen ${CMAKE_CTEST_COMMAND}
--build-and-test --build-and-test
"${CMake_SOURCE_DIR}/Tests/QtAutomoc" "${CMake_SOURCE_DIR}/Tests/QtAutogen"
"${CMake_BINARY_DIR}/Tests/Qt5Automoc" "${CMake_BINARY_DIR}/Tests/Qt5Autogen"
${build_generator_args} ${build_generator_args}
--build-project QtAutomoc --build-project QtAutogen
--build-exe-dir "${CMake_BINARY_DIR}/Tests/Qt5Automoc" --build-exe-dir "${CMake_BINARY_DIR}/Tests/Qt5Autogen"
--force-new-ctest-process --force-new-ctest-process
--build-options -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE} -DQT_TEST_VERSION=5 --build-options -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE} -DQT_TEST_VERSION=5
--test-command ${CMAKE_CTEST_COMMAND} -V --test-command ${CMAKE_CTEST_COMMAND} -V
) )
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt5Automoc") list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt5Autogen")
endif() endif()
if(QT4_WORKS AND QT_QTGUI_FOUND) if(QT4_WORKS AND QT_QTGUI_FOUND)
add_test(Qt4Automoc ${CMAKE_CTEST_COMMAND} add_test(Qt4Autogen ${CMAKE_CTEST_COMMAND}
--build-and-test --build-and-test
"${CMake_SOURCE_DIR}/Tests/QtAutomoc" "${CMake_SOURCE_DIR}/Tests/QtAutogen"
"${CMake_BINARY_DIR}/Tests/Qt4Automoc" "${CMake_BINARY_DIR}/Tests/Qt4Autogen"
${build_generator_args} ${build_generator_args}
--build-project QtAutomoc --build-project QtAutogen
--build-exe-dir "${CMake_BINARY_DIR}/Tests/Qt4Automoc" --build-exe-dir "${CMake_BINARY_DIR}/Tests/Qt4Autogen"
--force-new-ctest-process --force-new-ctest-process
--build-options -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE} -DQT_TEST_VERSION=4 --build-options -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE} -DQT_TEST_VERSION=4
--test-command ${CMAKE_CTEST_COMMAND} -V --test-command ${CMAKE_CTEST_COMMAND} -V
) )
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Automoc") list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Autogen")
add_test(Qt4Targets ${CMAKE_CTEST_COMMAND} add_test(Qt4Targets ${CMAKE_CTEST_COMMAND}
--build-and-test --build-and-test

View File

@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
project(QtAutomoc) project(QtAutogen)
if (QT_TEST_VERSION STREQUAL 4) if (QT_TEST_VERSION STREQUAL 4)
find_package(Qt4 REQUIRED) find_package(Qt4 REQUIRED)