Use fixed qt_add_resource BASE argument

Task-number: QTBUG-86726
Change-Id: I60decd981520475caccf112967afb82928612995
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

6 files changed, 42 insertions, 147 deletions

diff --git a/examples/remoteobjects/ssl/sslcppclient/CMakeLists.txt b/examples/remoteobjects/ssl/sslcppclient/CMakeLists.txt
index c634398..3750003 100644
--- a/examples/remoteobjects/ssl/sslcppclient/CMakeLists.txt
+++ b/examples/remoteobjects/ssl/sslcppclient/CMakeLists.txt
@@ -34,35 +34,14 @@ target_link_libraries(SslCppClient PUBLIC
 
 
 # Resources:
-set_source_files_properties("../sslserver/cert/client.crt"
-    PROPERTIES QT_RESOURCE_ALIAS "client.crt"
-)
-set_source_files_properties("../sslserver/cert/client.key"
-    PROPERTIES QT_RESOURCE_ALIAS "client.key"
-)
-set_source_files_properties("../sslserver/cert/rootCA.key"
-    PROPERTIES QT_RESOURCE_ALIAS "rootCA.key"
-)
-set_source_files_properties("../sslserver/cert/rootCA.pem"
-    PROPERTIES QT_RESOURCE_ALIAS "rootCA.pem"
-)
-set_source_files_properties("../sslserver/cert/rootCA.srl"
-    PROPERTIES QT_RESOURCE_ALIAS "rootCA.srl"
-)
-set_source_files_properties("../sslserver/cert/server.crt"
-    PROPERTIES QT_RESOURCE_ALIAS "server.crt"
-)
-set_source_files_properties("../sslserver/cert/server.key"
-    PROPERTIES QT_RESOURCE_ALIAS "server.key"
-)
 set(cert_resource_files
-    "client.crt"
-    "client.key"
-    "rootCA.key"
-    "rootCA.pem"
-    "rootCA.srl"
-    "server.crt"
-    "server.key"
+    "../sslserver/cert/client.crt"
+    "../sslserver/cert/client.key"
+    "../sslserver/cert/rootCA.key"
+    "../sslserver/cert/rootCA.pem"
+    "../sslserver/cert/rootCA.srl"
+    "../sslserver/cert/server.crt"
+    "../sslserver/cert/server.key"
 )
 
 qt6_add_resources(SslCppClient "cert"
diff --git a/examples/remoteobjects/ssl/sslserver/CMakeLists.txt b/examples/remoteobjects/ssl/sslserver/CMakeLists.txt
index 3ba15d9..aabefc7 100644
--- a/examples/remoteobjects/ssl/sslserver/CMakeLists.txt
+++ b/examples/remoteobjects/ssl/sslserver/CMakeLists.txt
@@ -36,13 +36,13 @@ target_link_libraries(sslserver PUBLIC
 
 # Resources:
 set(cert_resource_files
-    "client.crt"
-    "client.key"
-    "rootCA.key"
-    "rootCA.pem"
-    "rootCA.srl"
-    "server.crt"
-    "server.key"
+    "cert/client.crt"
+    "cert/client.key"
+    "cert/rootCA.key"
+    "cert/rootCA.pem"
+    "cert/rootCA.srl"
+    "cert/server.crt"
+    "cert/server.key"
 )
 
 qt6_add_resources(sslserver "cert"
diff --git a/examples/remoteobjects/websockets/wsclient/CMakeLists.txt b/examples/remoteobjects/websockets/wsclient/CMakeLists.txt
index 52287d0..cf37b75 100644
--- a/examples/remoteobjects/websockets/wsclient/CMakeLists.txt
+++ b/examples/remoteobjects/websockets/wsclient/CMakeLists.txt
@@ -43,35 +43,14 @@ target_link_libraries(wsclient PUBLIC
 
 
 # Resources:
-set_source_files_properties("../common/cert/client.crt"
-    PROPERTIES QT_RESOURCE_ALIAS "client.crt"
-)
-set_source_files_properties("../common/cert/client.key"
-    PROPERTIES QT_RESOURCE_ALIAS "client.key"
-)
-set_source_files_properties("../common/cert/rootCA.key"
-    PROPERTIES QT_RESOURCE_ALIAS "rootCA.key"
-)
-set_source_files_properties("../common/cert/rootCA.pem"
-    PROPERTIES QT_RESOURCE_ALIAS "rootCA.pem"
-)
-set_source_files_properties("../common/cert/rootCA.srl"
-    PROPERTIES QT_RESOURCE_ALIAS "rootCA.srl"
-)
-set_source_files_properties("../common/cert/server.crt"
-    PROPERTIES QT_RESOURCE_ALIAS "server.crt"
-)
-set_source_files_properties("../common/cert/server.key"
-    PROPERTIES QT_RESOURCE_ALIAS "server.key"
-)
 set(cert_resource_files
-    "client.crt"
-    "client.key"
-    "rootCA.key"
-    "rootCA.pem"
-    "rootCA.srl"
-    "server.crt"
-    "server.key"
+    "../common/cert/client.crt"
+    "../common/cert/client.key"
+    "../common/cert/rootCA.key"
+    "../common/cert/rootCA.pem"
+    "../common/cert/rootCA.srl"
+    "../common/cert/server.crt"
+    "../common/cert/server.key"
 )
 
 qt6_add_resources(wsclient "cert"
diff --git a/examples/remoteobjects/websockets/wsserver/CMakeLists.txt b/examples/remoteobjects/websockets/wsserver/CMakeLists.txt
index b896388..dcec0d0 100644
--- a/examples/remoteobjects/websockets/wsserver/CMakeLists.txt
+++ b/examples/remoteobjects/websockets/wsserver/CMakeLists.txt
@@ -43,35 +43,14 @@ target_link_libraries(wsserver PUBLIC
 
 
 # Resources:
-set_source_files_properties("../common/cert/client.crt"
-    PROPERTIES QT_RESOURCE_ALIAS "client.crt"
-)
-set_source_files_properties("../common/cert/client.key"
-    PROPERTIES QT_RESOURCE_ALIAS "client.key"
-)
-set_source_files_properties("../common/cert/rootCA.key"
-    PROPERTIES QT_RESOURCE_ALIAS "rootCA.key"
-)
-set_source_files_properties("../common/cert/rootCA.pem"
-    PROPERTIES QT_RESOURCE_ALIAS "rootCA.pem"
-)
-set_source_files_properties("../common/cert/rootCA.srl"
-    PROPERTIES QT_RESOURCE_ALIAS "rootCA.srl"
-)
-set_source_files_properties("../common/cert/server.crt"
-    PROPERTIES QT_RESOURCE_ALIAS "server.crt"
-)
-set_source_files_properties("../common/cert/server.key"
-    PROPERTIES QT_RESOURCE_ALIAS "server.key"
-)
 set(cert_resource_files
-    "client.crt"
-    "client.key"
-    "rootCA.key"
-    "rootCA.pem"
-    "rootCA.srl"
-    "server.crt"
-    "server.key"
+    "../common/cert/client.crt"
+    "../common/cert/client.key"
+    "../common/cert/rootCA.key"
+    "../common/cert/rootCA.pem"
+    "../common/cert/rootCA.srl"
+    "../common/cert/server.crt"
+    "../common/cert/server.key"
 )
 
 qt6_add_resources(wsserver "cert"
diff --git a/tests/auto/external_IODevice/sslTestServer/CMakeLists.txt b/tests/auto/external_IODevice/sslTestServer/CMakeLists.txt
index 370d92d..101dce1 100644
--- a/tests/auto/external_IODevice/sslTestServer/CMakeLists.txt
+++ b/tests/auto/external_IODevice/sslTestServer/CMakeLists.txt
@@ -17,35 +17,14 @@ qt_internal_add_executable(sslTestServer
 )
 
 # Resources:
-set_source_files_properties("../cert/client.crt"
-    PROPERTIES QT_RESOURCE_ALIAS "client.crt"
-)
-set_source_files_properties("../cert/client.key"
-    PROPERTIES QT_RESOURCE_ALIAS "client.key"
-)
-set_source_files_properties("../cert/rootCA.key"
-    PROPERTIES QT_RESOURCE_ALIAS "rootCA.key"
-)
-set_source_files_properties("../cert/rootCA.pem"
-    PROPERTIES QT_RESOURCE_ALIAS "rootCA.pem"
-)
-set_source_files_properties("../cert/rootCA.srl"
-    PROPERTIES QT_RESOURCE_ALIAS "rootCA.srl"
-)
-set_source_files_properties("../cert/server.crt"
-    PROPERTIES QT_RESOURCE_ALIAS "server.crt"
-)
-set_source_files_properties("../cert/server.key"
-    PROPERTIES QT_RESOURCE_ALIAS "server.key"
-)
 set(cert_resource_files
-    "client.crt"
-    "client.key"
-    "rootCA.key"
-    "rootCA.pem"
-    "rootCA.srl"
-    "server.crt"
-    "server.key"
+    "../cert/client.crt"
+    "../cert/client.key"
+    "../cert/rootCA.key"
+    "../cert/rootCA.pem"
+    "../cert/rootCA.srl"
+    "../cert/server.crt"
+    "../cert/server.key"
 )
 
 qt_internal_add_resource(sslTestServer "cert"
diff --git a/tests/auto/external_IODevice/tst_client/CMakeLists.txt b/tests/auto/external_IODevice/tst_client/CMakeLists.txt
index c85cbc4..202ee89 100644
--- a/tests/auto/external_IODevice/tst_client/CMakeLists.txt
+++ b/tests/auto/external_IODevice/tst_client/CMakeLists.txt
@@ -12,35 +12,14 @@ qt_internal_add_test(tst_external_IODevice
 )
 
 # Resources:
-set_source_files_properties("../cert/client.crt"
-    PROPERTIES QT_RESOURCE_ALIAS "client.crt"
-)
-set_source_files_properties("../cert/client.key"
-    PROPERTIES QT_RESOURCE_ALIAS "client.key"
-)
-set_source_files_properties("../cert/rootCA.key"
-    PROPERTIES QT_RESOURCE_ALIAS "rootCA.key"
-)
-set_source_files_properties("../cert/rootCA.pem"
-    PROPERTIES QT_RESOURCE_ALIAS "rootCA.pem"
-)
-set_source_files_properties("../cert/rootCA.srl"
-    PROPERTIES QT_RESOURCE_ALIAS "rootCA.srl"
-)
-set_source_files_properties("../cert/server.crt"
-    PROPERTIES QT_RESOURCE_ALIAS "server.crt"
-)
-set_source_files_properties("../cert/server.key"
-    PROPERTIES QT_RESOURCE_ALIAS "server.key"
-)
 set(cert_resource_files
-    "client.crt"
-    "client.key"
-    "rootCA.key"
-    "rootCA.pem"
-    "rootCA.srl"
-    "server.crt"
-    "server.key"
+    "../cert/client.crt"
+    "../cert/client.key"
+    "../cert/rootCA.key"
+    "../cert/rootCA.pem"
+    "../cert/rootCA.srl"
+    "../cert/server.crt"
+    "../cert/server.key"
 )
 
 qt_internal_add_resource(tst_external_IODevice "cert"