diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/auto/websockets/qwebsocketserver/CMakeLists.txt | 10 |
2 files changed, 5 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e83d3e..c8c1150 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,9 @@ project(QtWebSockets # special case LANGUAGES CXX C ) +# Make sure we use the fixed BASE argument of qt_add_resource. +set(QT_USE_FIXED_QT_ADD_RESOURCE_BASE TRUE) + find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core Network) # special case find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS Quick QuickTest) # special case @@ -18,4 +21,3 @@ if(NOT TARGET Qt::Network) return() endif() qt_build_repo() - diff --git a/tests/auto/websockets/qwebsocketserver/CMakeLists.txt b/tests/auto/websockets/qwebsocketserver/CMakeLists.txt index 2e54d4c..ff35a34 100644 --- a/tests/auto/websockets/qwebsocketserver/CMakeLists.txt +++ b/tests/auto/websockets/qwebsocketserver/CMakeLists.txt @@ -12,15 +12,9 @@ qt_internal_add_test(tst_qwebsocketserver ) # Resources: -set_source_files_properties("../shared/localhost.cert" - PROPERTIES QT_RESOURCE_ALIAS "localhost.cert" -) -set_source_files_properties("../shared/localhost.key" - PROPERTIES QT_RESOURCE_ALIAS "localhost.key" -) set(qwebsocketshared_resource_files - "localhost.cert" - "localhost.key" + "../shared/localhost.cert" + "../shared/localhost.key" ) qt_internal_add_resource(tst_qwebsocketserver "qwebsocketshared" |