diff options
| author | Brad King <brad.king@kitware.com> | 2015-04-16 16:51:05 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-04-16 19:10:40 (GMT) |
| commit | e8fdd5f12a379ce91adcb88acdb4354bc271c911 (patch) | |
| tree | 1fa0d4d344d1720151b4dd622c943611b4ded2d4 /Tests | |
| parent | 15f1a6b49958cc7757f951839b02a00e8c820154 (diff) | |
| download | CMake-e8fdd5f12a379ce91adcb88acdb4354bc271c911.zip CMake-e8fdd5f12a379ce91adcb88acdb4354bc271c911.tar.gz CMake-e8fdd5f12a379ce91adcb88acdb4354bc271c911.tar.bz2 | |
QtAutogen: Workaround rcc CRCRLF newlines on Windows (#15459)
The 'rcc --list' operation may print newlines of the form CRCRLF,
so strip any trailing CR characters found on each line.
Update the Tests/QtAutogen test to use a resource named in a
subdirectory. This causes 'rcc --list' to display a blank line
and tests that it is correctly filtered out.
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/QtAutogen/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/QtAutogen/autorcc_depends/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/QtAutogen/autorcc_depends/res1.qrc.in | 2 | ||||
| -rw-r--r-- | Tests/QtAutogen/autorcc_depends/res1/input.txt.in (renamed from Tests/QtAutogen/autorcc_depends/res1_input.txt.in) | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt index 67e0f7e..f76d11e 100644 --- a/Tests/QtAutogen/CMakeLists.txt +++ b/Tests/QtAutogen/CMakeLists.txt @@ -147,7 +147,7 @@ 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}/autorcc_depends/res1/input.txt") execute_process(COMMAND "${CMAKE_COMMAND}" --build . WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/autorcc_depends" diff --git a/Tests/QtAutogen/autorcc_depends/CMakeLists.txt b/Tests/QtAutogen/autorcc_depends/CMakeLists.txt index 9faf803..fbe71ad 100644 --- a/Tests/QtAutogen/autorcc_depends/CMakeLists.txt +++ b/Tests/QtAutogen/autorcc_depends/CMakeLists.txt @@ -16,7 +16,7 @@ else() endif() configure_file(res1.qrc.in res1.qrc @ONLY) -configure_file(res1_input.txt.in res1_input.txt @ONLY) +configure_file(res1/input.txt.in res1/input.txt @ONLY) add_executable(test_res1 test_res1.cpp diff --git a/Tests/QtAutogen/autorcc_depends/res1.qrc.in b/Tests/QtAutogen/autorcc_depends/res1.qrc.in index cfea618..2a5417b 100644 --- a/Tests/QtAutogen/autorcc_depends/res1.qrc.in +++ b/Tests/QtAutogen/autorcc_depends/res1.qrc.in @@ -1,5 +1,5 @@ <RCC> <qresource prefix="/"> - <file>res1_input.txt</file> + <file>res1/input.txt</file> </qresource> </RCC> diff --git a/Tests/QtAutogen/autorcc_depends/res1_input.txt.in b/Tests/QtAutogen/autorcc_depends/res1/input.txt.in index da62762..da62762 100644 --- a/Tests/QtAutogen/autorcc_depends/res1_input.txt.in +++ b/Tests/QtAutogen/autorcc_depends/res1/input.txt.in |