diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-05-20 11:37:27 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-05-20 12:49:37 +0200 |
| commit | 7029ecade96876d08af7d576e0b81417502acbaa (patch) | |
| tree | 9b70980a119b9ecc9a8e69cd777d5c79a219319d /tests/auto/cmake | |
| parent | 68866b1a7bcade79e425f609fc1680203b89112e (diff) | |
cmake: correct version dependency for qt5_add_big_resources
qt5_add_big_resources is only available if using CMake 3.9 and later.
This amends cdccd0222bbed1954d5d7fe0da9d2308c202f3b1.
Task-number: QTBUG-55680
Task-number: QTBUG-75806
Change-Id: Ibba7af6ee7edfb226368937d543b7ec5cc93eb16
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'tests/auto/cmake')
| -rw-r--r-- | tests/auto/cmake/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | tests/auto/cmake/test_add_big_resource/CMakeLists.txt | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index 51d0d2879e..5b10a74d3f 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -146,7 +146,12 @@ endif() expect_pass(test_interface_link_libraries) expect_pass(test_moc_macro_target) -expect_pass(test_add_big_resource) + +if (NOT CMAKE_VERSION VERSION_LESS 3.9) + # The modification of TARGET_OBJECTS needs the following change in cmake + # https://gitlab.kitware.com/cmake/cmake/commit/93c89bc75ceee599ba7c08b8fe1ac5104942054f + expect_pass(test_add_big_resource) +endif() if (NOT CMAKE_VERSION VERSION_LESS 3.8) # With earlier CMake versions, this test would simply run moc multiple times and lead to: diff --git a/tests/auto/cmake/test_add_big_resource/CMakeLists.txt b/tests/auto/cmake/test_add_big_resource/CMakeLists.txt index f928b11278..45ed2c79d5 100644 --- a/tests/auto/cmake/test_add_big_resource/CMakeLists.txt +++ b/tests/auto/cmake/test_add_big_resource/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.9) project(test_add_big_resource) |