diff options
author | Sebastian Holtermann <sebholt@xwmw.org> | 2017-03-02 16:07:53 (GMT) |
---|---|---|
committer | Sebastian Holtermann <sebholt@xwmw.org> | 2017-03-06 21:01:03 (GMT) |
commit | 9cad44dce264b509afc4b50b540b3a8594cf3217 (patch) | |
tree | 074e52f85b4df78745c1bb218f7dfbaa9eec07f7 /Tests/QtAutogen | |
parent | 60274e1d94c8409f810332345339de5dd449056b (diff) | |
download | CMake-9cad44dce264b509afc4b50b540b3a8594cf3217.zip CMake-9cad44dce264b509afc4b50b540b3a8594cf3217.tar.gz CMake-9cad44dce264b509afc4b50b540b3a8594cf3217.tar.bz2 |
Autogen: Test: Rename autorcc_depends test to rccDepends
Diffstat (limited to 'Tests/QtAutogen')
-rw-r--r-- | Tests/QtAutogen/CMakeLists.txt | 14 | ||||
-rw-r--r-- | Tests/QtAutogen/rccDepends/CMakeLists.txt (renamed from Tests/QtAutogen/autorcc_depends/CMakeLists.txt) | 2 | ||||
-rw-r--r-- | Tests/QtAutogen/rccDepends/res1.qrc.in (renamed from Tests/QtAutogen/autorcc_depends/res1.qrc.in) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/rccDepends/res1/input.txt.in (renamed from Tests/QtAutogen/autorcc_depends/res1/input.txt.in) | 0 | ||||
-rw-r--r-- | Tests/QtAutogen/rccDepends/test_res1.cpp (renamed from Tests/QtAutogen/autorcc_depends/test_res1.cpp) | 0 |
5 files changed, 8 insertions, 8 deletions
diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt index 4960472..4b84486 100644 --- a/Tests/QtAutogen/CMakeLists.txt +++ b/Tests/QtAutogen/CMakeLists.txt @@ -83,19 +83,19 @@ target_compile_features(empty PRIVATE ${QT_COMPILE_FEATURES}) # -- Test # When a file listed in a .qrc file changes the target must be rebuilt try_compile(RCC_DEPENDS - "${CMAKE_CURRENT_BINARY_DIR}/autorcc_depends" - "${CMAKE_CURRENT_SOURCE_DIR}/autorcc_depends" - autorcc_depends + "${CMAKE_CURRENT_BINARY_DIR}/rccDepends" + "${CMAKE_CURRENT_SOURCE_DIR}/rccDepends" + rccDepends 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 RCC_DEPENDS) - message(SEND_ERROR "Initial build of autorcc_depends failed. Output: ${output}") + message(SEND_ERROR "Initial build of rccDepends failed. Output: ${output}") endif() -file(STRINGS "${CMAKE_CURRENT_BINARY_DIR}/autorcc_depends/info_file.txt" qrc_files) +file(STRINGS "${CMAKE_CURRENT_BINARY_DIR}/rccDepends/info_file.txt" qrc_files) list(GET qrc_files 0 qrc_file1) @@ -104,10 +104,10 @@ set(timeformat "%Y%j%H%M%S") file(TIMESTAMP "${qrc_file1}" file1_before "${timeformat}") execute_process(COMMAND "${CMAKE_COMMAND}" -E sleep 1) # Ensure that the timestamp will change. -execute_process(COMMAND "${CMAKE_COMMAND}" -E touch "${CMAKE_CURRENT_BINARY_DIR}/autorcc_depends/res1/input.txt") +execute_process(COMMAND "${CMAKE_COMMAND}" -E touch "${CMAKE_CURRENT_BINARY_DIR}/rccDepends/res1/input.txt") execute_process(COMMAND "${CMAKE_COMMAND}" --build . - WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/autorcc_depends" + WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/rccDepends" ) file(TIMESTAMP "${qrc_file1}" file1_step1 "${timeformat}") diff --git a/Tests/QtAutogen/autorcc_depends/CMakeLists.txt b/Tests/QtAutogen/rccDepends/CMakeLists.txt index 7b51e11..c983420 100644 --- a/Tests/QtAutogen/autorcc_depends/CMakeLists.txt +++ b/Tests/QtAutogen/rccDepends/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.7) -project(autorcc_depends) +project(rccDepends) set(CMAKE_AUTORCC ON) diff --git a/Tests/QtAutogen/autorcc_depends/res1.qrc.in b/Tests/QtAutogen/rccDepends/res1.qrc.in index 2a5417b..2a5417b 100644 --- a/Tests/QtAutogen/autorcc_depends/res1.qrc.in +++ b/Tests/QtAutogen/rccDepends/res1.qrc.in diff --git a/Tests/QtAutogen/autorcc_depends/res1/input.txt.in b/Tests/QtAutogen/rccDepends/res1/input.txt.in index da62762..da62762 100644 --- a/Tests/QtAutogen/autorcc_depends/res1/input.txt.in +++ b/Tests/QtAutogen/rccDepends/res1/input.txt.in diff --git a/Tests/QtAutogen/autorcc_depends/test_res1.cpp b/Tests/QtAutogen/rccDepends/test_res1.cpp index 766b775..766b775 100644 --- a/Tests/QtAutogen/autorcc_depends/test_res1.cpp +++ b/Tests/QtAutogen/rccDepends/test_res1.cpp |