diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-08-11 16:51:18 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-08-12 13:30:05 +0200 |
commit | 8740e7b9d95fa094215d2b88975a2bccc1bd51d5 (patch) | |
tree | 9be2b0a893b13cd222135f9343058f516a7ecaa4 | |
parent | 51734cd595f7d6fa0eb2ca3436a19d23ed8859dc (diff) |
CMake: Fix build with Qt 6.1/6.2
Change-Id: I7f10d37a347b982d904024ebb583ad4d9628769c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r-- | examples/httpserver/afterrequest/CMakeLists.txt | 2 | ||||
-rw-r--r-- | examples/httpserver/simple/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/httpserver/CMakeLists.txt | 8 | ||||
-rw-r--r-- | src/sslserver/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/auto/qabstracthttpserver/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/auto/qhttpserver/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/auto/qhttpserverresponder/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/auto/qhttpserverresponse/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/auto/qhttpserverrouter/CMakeLists.txt | 2 |
9 files changed, 12 insertions, 12 deletions
diff --git a/examples/httpserver/afterrequest/CMakeLists.txt b/examples/httpserver/afterrequest/CMakeLists.txt index 4f38035..3d427f7 100644 --- a/examples/httpserver/afterrequest/CMakeLists.txt +++ b/examples/httpserver/afterrequest/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples/httpserver/afterrequest") find_package(Qt6 COMPONENTS HttpServer) -add_executable(afterrequest +qt_add_executable(afterrequest main.cpp ) target_link_libraries(afterrequest PUBLIC diff --git a/examples/httpserver/simple/CMakeLists.txt b/examples/httpserver/simple/CMakeLists.txt index 07d21a7..5562e9c 100644 --- a/examples/httpserver/simple/CMakeLists.txt +++ b/examples/httpserver/simple/CMakeLists.txt @@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "examples/httpserver/simple") find_package(Qt6 COMPONENTS HttpServer) -add_executable(simple +qt_add_executable(simple main.cpp ) target_link_libraries(simple PUBLIC diff --git a/src/httpserver/CMakeLists.txt b/src/httpserver/CMakeLists.txt index a552ca2..89b9710 100644 --- a/src/httpserver/CMakeLists.txt +++ b/src/httpserver/CMakeLists.txt @@ -4,7 +4,7 @@ ## HttpServer Module: ##################################################################### -qt_add_module(HttpServer +qt_internal_add_module(HttpServer SOURCES ../3rdparty/http-parser/http_parser.c ../3rdparty/http-parser/http_parser.h qabstracthttpserver.cpp qabstracthttpserver.h qabstracthttpserver_p.h @@ -34,7 +34,7 @@ qt_add_module(HttpServer ## Scopes: ##################################################################### -qt_extend_target(HttpServer CONDITION TARGET Qt::WebSockets +qt_internal_extend_target(HttpServer CONDITION TARGET Qt::WebSockets LIBRARIES Qt::WebSocketsPrivate PUBLIC_LIBRARIES @@ -43,12 +43,12 @@ qt_extend_target(HttpServer CONDITION TARGET Qt::WebSockets Qt::WebSocketsPrivate ) -qt_extend_target(HttpServer CONDITION QT_FEATURE_ssl +qt_internal_extend_target(HttpServer CONDITION QT_FEATURE_ssl PUBLIC_LIBRARIES Qt::SslServer ) -qt_extend_target(HttpServer CONDITION TARGET Qt::Concurrent +qt_internal_extend_target(HttpServer CONDITION TARGET Qt::Concurrent SOURCES qhttpserverfutureresponse.cpp qhttpserverfutureresponse.h PUBLIC_LIBRARIES diff --git a/src/sslserver/CMakeLists.txt b/src/sslserver/CMakeLists.txt index 580d824..5f67644 100644 --- a/src/sslserver/CMakeLists.txt +++ b/src/sslserver/CMakeLists.txt @@ -4,7 +4,7 @@ ## SslServer Module: ##################################################################### -qt_add_module(SslServer +qt_internal_add_module(SslServer SOURCES qsslserver.cpp qsslserver.h qsslserver_p.h qtsslserverglobal.h diff --git a/tests/auto/qabstracthttpserver/CMakeLists.txt b/tests/auto/qabstracthttpserver/CMakeLists.txt index f7de801..9249a7e 100644 --- a/tests/auto/qabstracthttpserver/CMakeLists.txt +++ b/tests/auto/qabstracthttpserver/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qabstracthttpserver Test: ##################################################################### -qt_add_test(tst_qabstracthttpserver +qt_internal_add_test(tst_qabstracthttpserver SOURCES tst_qabstracthttpserver.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/qhttpserver/CMakeLists.txt b/tests/auto/qhttpserver/CMakeLists.txt index 806494e..468df11 100644 --- a/tests/auto/qhttpserver/CMakeLists.txt +++ b/tests/auto/qhttpserver/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "data/") -qt_add_test(tst_qhttpserver +qt_internal_add_test(tst_qhttpserver SOURCES tst_qhttpserver.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/qhttpserverresponder/CMakeLists.txt b/tests/auto/qhttpserverresponder/CMakeLists.txt index 51a2a33..76d27f2 100644 --- a/tests/auto/qhttpserverresponder/CMakeLists.txt +++ b/tests/auto/qhttpserverresponder/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "data/") -qt_add_test(tst_qhttpserverresponder +qt_internal_add_test(tst_qhttpserverresponder SOURCES tst_qhttpserverresponder.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/qhttpserverresponse/CMakeLists.txt b/tests/auto/qhttpserverresponse/CMakeLists.txt index 7ab6d6c..038c423 100644 --- a/tests/auto/qhttpserverresponse/CMakeLists.txt +++ b/tests/auto/qhttpserverresponse/CMakeLists.txt @@ -7,7 +7,7 @@ # Collect test data list(APPEND test_data "data/") -qt_add_test(tst_qhttpserverresponse +qt_internal_add_test(tst_qhttpserverresponse SOURCES tst_qhttpserverresponse.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/qhttpserverrouter/CMakeLists.txt b/tests/auto/qhttpserverrouter/CMakeLists.txt index 27901fc..6394f76 100644 --- a/tests/auto/qhttpserverrouter/CMakeLists.txt +++ b/tests/auto/qhttpserverrouter/CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qhttpserverrouter Test: ##################################################################### -qt_add_test(tst_qhttpserverrouter +qt_internal_add_test(tst_qhttpserverrouter SOURCES tst_qhttpserverrouter.cpp PUBLIC_LIBRARIES |