diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-23 16:06:31 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-24 13:11:19 +0000 |
| commit | e3e3a6243fe0673f8bde445cfe47a88f3392ea48 (patch) | |
| tree | 27e61a80d243cd48362c29ca7ee42f7f95db9c82 | |
| parent | caf565a6a538bbd66f1867a2608bd6a8ac07d4fd (diff) | |
CMake: Regenerate projects after mergewip/cmake
Change-Id: Ie3dcf131d55db1b5d5a6271910785e4aac46140e
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | src/oauth/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/.prev_CMakeLists.txt | 9 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | tests/auto/abstractoauth/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | tests/auto/oauth1/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | tests/auto/oauth1signature/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tests/auto/oauth2/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | tests/auto/oauthhttpserverreplyhandler/CMakeLists.txt | 3 |
8 files changed, 16 insertions, 24 deletions
diff --git a/src/oauth/CMakeLists.txt b/src/oauth/CMakeLists.txt index 401bb7d..f16c30b 100644 --- a/src/oauth/CMakeLists.txt +++ b/src/oauth/CMakeLists.txt @@ -20,6 +20,8 @@ qt_add_module(NetworkAuth PUBLIC_LIBRARIES Qt::Core Qt::Network + PRIVATE_MODULE_INTERFACE + Qt::CorePrivate ) #### Keys ignored in scope 1:.:.:oauth.pro:<TRUE>: diff --git a/tests/.prev_CMakeLists.txt b/tests/.prev_CMakeLists.txt index 61c8c7e..2214137 100644 --- a/tests/.prev_CMakeLists.txt +++ b/tests/.prev_CMakeLists.txt @@ -1,10 +1,7 @@ # Generated from tests.pro. -if(NOT TARGET Qt::Test) - cmake_minimum_required(VERSION 3.15.0) - project(QtNetworkAuthTests VERSION 6.0.0 LANGUAGES C CXX) - find_package(Qt6 ${PROJECT_VERSION} REQUIRED COMPONENTS BuildInternals Core SET_ME_TO_SOMETHING_USEFUL) - find_package(Qt6 ${PROJECT_VERSION} OPTIONAL_COMPONENTS SET_ME_TO_SOMETHING_USEFUL) - qt_set_up_standalone_tests_build() +if(QT_BUILD_STANDALONE_TESTS) + # Add qt_find_package calls for extra dependencies that need to be found when building + # the standalone tests here. endif() qt_build_tests() diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 642d62c..ce4dc49 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,10 +1,8 @@ # Generated from tests.pro. -if(NOT TARGET Qt::Test) - cmake_minimum_required(VERSION 3.15.0) - project(QtNetworkAuthTests VERSION 6.0.0 LANGUAGES C CXX) - find_package(Qt6 ${PROJECT_VERSION} REQUIRED COMPONENTS BuildInternals Core NetworkAuth Test) # special case - qt_set_up_standalone_tests_build() +if(QT_BUILD_STANDALONE_TESTS) + # Add qt_find_package calls for extra dependencies that need to be found when building + # the standalone tests here. endif() qt_build_tests() diff --git a/tests/auto/abstractoauth/CMakeLists.txt b/tests/auto/abstractoauth/CMakeLists.txt index c8c2626..a8e6404 100644 --- a/tests/auto/abstractoauth/CMakeLists.txt +++ b/tests/auto/abstractoauth/CMakeLists.txt @@ -7,12 +7,11 @@ qt_add_test(tst_abstractoauth SOURCES tst_abstractoauth.cpp - LIBRARIES - Qt::CorePrivate - Qt::NetworkAuthPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Network Qt::NetworkAuth + Qt::NetworkAuthPrivate ) #### Keys ignored in scope 1:.:.:abstractoauth.pro:<TRUE>: diff --git a/tests/auto/oauth1/CMakeLists.txt b/tests/auto/oauth1/CMakeLists.txt index fb156ad..24fb617 100644 --- a/tests/auto/oauth1/CMakeLists.txt +++ b/tests/auto/oauth1/CMakeLists.txt @@ -10,12 +10,11 @@ qt_add_test(tst_oauth1 tst_oauth1.cpp INCLUDE_DIRECTORIES ../shared - LIBRARIES - Qt::CorePrivate - Qt::NetworkAuthPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Network Qt::NetworkAuth + Qt::NetworkAuthPrivate ) #### Keys ignored in scope 1:.:.:oauth1.pro:<TRUE>: diff --git a/tests/auto/oauth1signature/CMakeLists.txt b/tests/auto/oauth1signature/CMakeLists.txt index cc2ca00..e71ec9b 100644 --- a/tests/auto/oauth1signature/CMakeLists.txt +++ b/tests/auto/oauth1signature/CMakeLists.txt @@ -7,9 +7,8 @@ qt_add_test(tst_oauth1signature SOURCES tst_oauth1signature.cpp - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::NetworkAuth ) diff --git a/tests/auto/oauth2/CMakeLists.txt b/tests/auto/oauth2/CMakeLists.txt index bf9c898..e9426d4 100644 --- a/tests/auto/oauth2/CMakeLists.txt +++ b/tests/auto/oauth2/CMakeLists.txt @@ -10,12 +10,11 @@ qt_add_test(tst_oauth2 tst_oauth2.cpp INCLUDE_DIRECTORIES ../shared - LIBRARIES - Qt::CorePrivate - Qt::NetworkAuthPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Network Qt::NetworkAuth + Qt::NetworkAuthPrivate ) #### Keys ignored in scope 1:.:.:oauth2.pro:<TRUE>: diff --git a/tests/auto/oauthhttpserverreplyhandler/CMakeLists.txt b/tests/auto/oauthhttpserverreplyhandler/CMakeLists.txt index d93460c..6ce86d3 100644 --- a/tests/auto/oauthhttpserverreplyhandler/CMakeLists.txt +++ b/tests/auto/oauthhttpserverreplyhandler/CMakeLists.txt @@ -7,9 +7,8 @@ qt_add_test(tst_oauthhttpserverreplyhandler SOURCES tst_oauthhttpserverreplyhandler.cpp - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Network Qt::NetworkAuth ) |