diff options
| -rw-r--r-- | coin/module_config.yaml | 13 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 8 |
2 files changed, 17 insertions, 4 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml new file mode 100644 index 0000000..9f29e11 --- /dev/null +++ b/coin/module_config.yaml @@ -0,0 +1,13 @@ +version: 1 +accept_configuration: + condition: property + property: host.os + equals_property: target.os + +build_instructions: + - !include "{{qt/qtbase}}/prepare_building_env.yaml" + - !include "{{qt/qtbase}}/cmake_module_build_instructions.yaml" + - !include "{{qt/qtbase}}/cmake_build_and_upload_test_artifacts.yaml" + +test_instructions: + - !include "{{qt/qtbase}}/cmake_regular_test_instructions.yaml" diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 757c418..97ac2c2 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -2,10 +2,10 @@ # special case begin if(NOT TARGET Qt::Test) - cmake_minimum_required(VERSION 3.14.0) - project(QtImageFormatsTests C CXX ASM) - find_package(Qt5 REQUIRED COMPONENTS BuildInternals Core Test) - find_package(Qt5 COMPONENTS Gui) + cmake_minimum_required(VERSION 3.15.0) + project(QtImageFormatsTests VERSION 6.0.0 LANGUAGES C CXX ASM) + find_package(Qt6 REQUIRED COMPONENTS BuildInternals Core Test + OPTIONAL_COMPONENTS Gui) qt_set_up_standalone_tests_build() endif() # special case end |