diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-09-26 16:28:56 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-09-30 09:14:02 +0000 |
commit | cd5e9aa39f192f8265064e59e7771241f81a5f9c (patch) | |
tree | e5066c03b8df058cdf7847f3768f037d0dd9be45 /tests | |
parent | e31ed2abc236f0c92ede9e1dd5ad6ecd53cc26f4 (diff) |
Regenerate qtneworkauth
Fixes examples to be actually standalone examples.
Also some special cases were added here and there.
And some new changes that comes from the newer version of pro2cmake.
Change-Id: I0053bb740e41b44bf793ec4e284283bf013eaac8
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/.prev_CMakeLists.txt | 10 | ||||
-rw-r--r-- | tests/CMakeLists.txt | 9 | ||||
-rw-r--r-- | tests/auto/.prev_CMakeLists.txt | 10 | ||||
-rw-r--r-- | tests/auto/CMakeLists.txt | 4 | ||||
-rw-r--r-- | tests/auto/abstractoauth/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/auto/oauth1/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/auto/oauth1signature/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/auto/oauth2/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/auto/oauthhttpserverreplyhandler/CMakeLists.txt | 1 |
9 files changed, 25 insertions, 13 deletions
diff --git a/tests/.prev_CMakeLists.txt b/tests/.prev_CMakeLists.txt new file mode 100644 index 0000000..61c8c7e --- /dev/null +++ b/tests/.prev_CMakeLists.txt @@ -0,0 +1,10 @@ +# 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() +endif() +qt_build_tests() diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 6864b94..642d62c 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,11 +1,10 @@ -# special case begin +# 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 ASM) - find_package(Qt6 REQUIRED COMPONENTS BuildInternals Core NetworkAuth Test) + 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() endif() -# special case end qt_build_tests() - diff --git a/tests/auto/.prev_CMakeLists.txt b/tests/auto/.prev_CMakeLists.txt new file mode 100644 index 0000000..ccb6649 --- /dev/null +++ b/tests/auto/.prev_CMakeLists.txt @@ -0,0 +1,10 @@ +# Generated from auto.pro. + +add_subdirectory(cmake) +add_subdirectory(oauth1) +add_subdirectory(oauth2) +add_subdirectory(oauth1signature) +add_subdirectory(oauthhttpserverreplyhandler) +if(QT_FEATURE_private_tests) + add_subdirectory(abstractoauth) +endif() diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index fa4cd38..dd1f872 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -1,12 +1,10 @@ # Generated from auto.pro. -## Currently doesn't build -#add_subdirectory(cmake) +# add_subdirectory(cmake) special case remove add_subdirectory(oauth1) add_subdirectory(oauth2) add_subdirectory(oauth1signature) add_subdirectory(oauthhttpserverreplyhandler) - if(QT_FEATURE_private_tests) add_subdirectory(abstractoauth) endif() diff --git a/tests/auto/abstractoauth/CMakeLists.txt b/tests/auto/abstractoauth/CMakeLists.txt index 23e4e29..8c2d18f 100644 --- a/tests/auto/abstractoauth/CMakeLists.txt +++ b/tests/auto/abstractoauth/CMakeLists.txt @@ -16,5 +16,4 @@ add_qt_test(tst_abstractoauth ) #### Keys ignored in scope 1:.:.:abstractoauth.pro:<TRUE>: -# CONFIG = "testcase" # TEMPLATE = "app" diff --git a/tests/auto/oauth1/CMakeLists.txt b/tests/auto/oauth1/CMakeLists.txt index c4f8894..5bda83e 100644 --- a/tests/auto/oauth1/CMakeLists.txt +++ b/tests/auto/oauth1/CMakeLists.txt @@ -19,5 +19,4 @@ add_qt_test(tst_oauth1 ) #### Keys ignored in scope 1:.:.:oauth1.pro:<TRUE>: -# CONFIG = "testcase" # TEMPLATE = "app" diff --git a/tests/auto/oauth1signature/CMakeLists.txt b/tests/auto/oauth1signature/CMakeLists.txt index c2bc45a..8ae95ec 100644 --- a/tests/auto/oauth1signature/CMakeLists.txt +++ b/tests/auto/oauth1signature/CMakeLists.txt @@ -14,5 +14,4 @@ add_qt_test(tst_oauth1signature ) #### Keys ignored in scope 1:.:.:oauth1signature.pro:<TRUE>: -# CONFIG = "testcase" # TEMPLATE = "app" diff --git a/tests/auto/oauth2/CMakeLists.txt b/tests/auto/oauth2/CMakeLists.txt index d325c9f..6db49b4 100644 --- a/tests/auto/oauth2/CMakeLists.txt +++ b/tests/auto/oauth2/CMakeLists.txt @@ -19,5 +19,4 @@ add_qt_test(tst_oauth2 ) #### Keys ignored in scope 1:.:.:oauth2.pro:<TRUE>: -# CONFIG = "testcase" # TEMPLATE = "app" diff --git a/tests/auto/oauthhttpserverreplyhandler/CMakeLists.txt b/tests/auto/oauthhttpserverreplyhandler/CMakeLists.txt index fd7941d..f89465c 100644 --- a/tests/auto/oauthhttpserverreplyhandler/CMakeLists.txt +++ b/tests/auto/oauthhttpserverreplyhandler/CMakeLists.txt @@ -15,5 +15,4 @@ add_qt_test(tst_oauthhttpserverreplyhandler ) #### Keys ignored in scope 1:.:.:oauthhttpserverreplyhandler.pro:<TRUE>: -# CONFIG = "testcase" # TEMPLATE = "app" |