diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-03-16 17:16:14 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-03-23 13:10:14 +0100 |
| commit | 446b68ade25446e8bf8447fe80d317c2495659bc (patch) | |
| tree | fee2883ecb6da51383a2c187b9ca3b5982d37a61 /tests | |
| parent | b8935eca5625be034632200adcccf18a398f67a2 (diff) | |
Rework deprecated cmake tests
Pick-to: 6.1
Fixes: QTBUG-78167
Change-Id: I8c34d36502b4dc9092c7cf88b34bef569cd7a4bf
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/cmake/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/cmake/test_modules/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | tests/auto/cmake/test_modules/container/CMakeLists.txt | 23 | ||||
| -rw-r--r-- | tests/auto/cmake/test_modules/server/CMakeLists.txt | 23 |
4 files changed, 8 insertions, 47 deletions
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index 7c882c2..b91e9a4 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -41,4 +41,6 @@ if(TARGET Qt6::Widgets AND TARGET Qt6::Gui) _qt_internal_test_expect_fail(test_target_typelibs_empty_libs) _qt_internal_test_expect_fail(test_target_typelibs_non_existing_libs) _qt_internal_test_expect_pass(test_target_typelibs_out_dir) + _qt_internal_test_expect_pass(test_modules/container) + _qt_internal_test_expect_pass(test_modules/server) endif() diff --git a/tests/auto/cmake/test_modules/CMakeLists.txt b/tests/auto/cmake/test_modules/CMakeLists.txt deleted file mode 100644 index 4336ad4..0000000 --- a/tests/auto/cmake/test_modules/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ - -cmake_minimum_required(VERSION 2.8) - -project(test_modules) - -add_subdirectory(server) -add_subdirectory(container) diff --git a/tests/auto/cmake/test_modules/container/CMakeLists.txt b/tests/auto/cmake/test_modules/container/CMakeLists.txt index 6d04576..124e065 100644 --- a/tests/auto/cmake/test_modules/container/CMakeLists.txt +++ b/tests/auto/cmake/test_modules/container/CMakeLists.txt @@ -1,24 +1,7 @@ - -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.14) project(cmake_axcontainer) -find_package(Qt5Core REQUIRED) -find_package(Qt5Gui REQUIRED) -find_package(Qt5Widgets REQUIRED) - -find_package(Qt5AxContainer REQUIRED) - -include_directories( - ${Qt5AxContainer_INCLUDE_DIRS} -) - -add_definitions(${Qt5AxContainer_DEFINITIONS}) - -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") - +find_package(Qt6 COMPONENTS Core Gui Widgets AxContainer CONFIG REQUIRED) add_executable(axcontainerapp axcontainer.cpp) - -target_link_libraries(axcontainerapp - ${Qt5AxContainer_LIBRARIES} -) +target_link_libraries(axcontainerapp Qt6::Core Qt6::Gui Qt6::Widgets Qt6::AxContainer) diff --git a/tests/auto/cmake/test_modules/server/CMakeLists.txt b/tests/auto/cmake/test_modules/server/CMakeLists.txt index f553990..255b13d 100644 --- a/tests/auto/cmake/test_modules/server/CMakeLists.txt +++ b/tests/auto/cmake/test_modules/server/CMakeLists.txt @@ -1,24 +1,7 @@ - -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.14) project(cmake_axserver) -find_package(Qt5Core REQUIRED) -find_package(Qt5Gui REQUIRED) -find_package(Qt5Widgets REQUIRED) - -find_package(Qt5AxServer REQUIRED) - -include_directories( - ${Qt5AxServer_INCLUDE_DIRS} -) - -add_definitions(${Qt5AxServer_DEFINITIONS}) - -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") - +find_package(Qt6 COMPONENTS Core Gui Widgets AxServer CONFIG REQUIRED) add_executable(axserverapp WIN32 axserver.cpp) - -target_link_libraries(axserverapp - ${Qt5AxServer_LIBRARIES} -) +target_link_libraries(axserverapp Qt6::Core Qt6::Gui Qt6::Widgets Qt6::AxServer) |