diff options
author | Sebastian Holtermann <sebholt@xwmw.org> | 2017-03-02 16:13:41 (GMT) |
---|---|---|
committer | Sebastian Holtermann <sebholt@xwmw.org> | 2017-03-06 21:01:03 (GMT) |
commit | 89780663b3f64eddf7dda2b5565935b73d92c146 (patch) | |
tree | a1a382d61b0ff74fd955667d556753c57b4416b3 /Tests/QtAutogen/CMakeLists.txt | |
parent | 9cad44dce264b509afc4b50b540b3a8594cf3217 (diff) | |
download | CMake-89780663b3f64eddf7dda2b5565935b73d92c146.zip CMake-89780663b3f64eddf7dda2b5565935b73d92c146.tar.gz CMake-89780663b3f64eddf7dda2b5565935b73d92c146.tar.bz2 |
Autogen: Test: Rename automoc_rerun test to mocRerun
Diffstat (limited to 'Tests/QtAutogen/CMakeLists.txt')
-rw-r--r-- | Tests/QtAutogen/CMakeLists.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt index 4b84486..bf40166 100644 --- a/Tests/QtAutogen/CMakeLists.txt +++ b/Tests/QtAutogen/CMakeLists.txt @@ -119,26 +119,26 @@ endif() # -- Test # Ensure a repeated build succeeds when a header containing a QObject changes try_compile(MOC_RERUN - "${CMAKE_CURRENT_BINARY_DIR}/automoc_rerun" - "${CMAKE_CURRENT_SOURCE_DIR}/automoc_rerun" - automoc_rerun + "${CMAKE_CURRENT_BINARY_DIR}/mocRerun" + "${CMAKE_CURRENT_SOURCE_DIR}/mocRerun" + mocRerun CMAKE_FLAGS "-DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}" "-DQT_TEST_VERSION=${QT_TEST_VERSION}" "-DCMAKE_PREFIX_PATH=${Qt_PREFIX_DIR}" OUTPUT_VARIABLE output ) if (NOT MOC_RERUN) - message(SEND_ERROR "Initial build of automoc_rerun failed. Output: ${output}") + message(SEND_ERROR "Initial build of mocRerun failed. Output: ${output}") endif() -configure_file(automoc_rerun/test1.h.in2 automoc_rerun/test1.h COPYONLY) +configure_file(mocRerun/test1b.h.in mocRerun/test1.h COPYONLY) execute_process(COMMAND "${CMAKE_COMMAND}" --build . - WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/automoc_rerun" + WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/mocRerun" RESULT_VARIABLE automoc_rerun_result ) if (automoc_rerun_result) - message(SEND_ERROR "Second build of automoc_rerun failed.") + message(SEND_ERROR "Second build of mocRerun failed.") endif() # -- Test |