Update via run_pro2cmake.py

... and address special cases

Change-Id: I2ceb88e9505c59fe48dd4612cfed82935eb2dfc4
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

16 files changed, 82 insertions, 24 deletions

diff --git a/examples/remoteobjects/clientapp/CMakeLists.txt b/examples/remoteobjects/clientapp/CMakeLists.txt
index 6b1446c..3431885 100644
--- a/examples/remoteobjects/clientapp/CMakeLists.txt
+++ b/examples/remoteobjects/clientapp/CMakeLists.txt
@@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples/remoteobjects/clientapp")
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/clientapp")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
diff --git a/examples/remoteobjects/cppclient/CMakeLists.txt b/examples/remoteobjects/cppclient/CMakeLists.txt
index 3bea6a8..f6dd299 100644
--- a/examples/remoteobjects/cppclient/CMakeLists.txt
+++ b/examples/remoteobjects/cppclient/CMakeLists.txt
@@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples/remoteobjects/cppclient")
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/cppclient")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS RemoteObjects)
diff --git a/examples/remoteobjects/modelviewclient/CMakeLists.txt b/examples/remoteobjects/modelviewclient/CMakeLists.txt
index 8b60772..cda7293 100644
--- a/examples/remoteobjects/modelviewclient/CMakeLists.txt
+++ b/examples/remoteobjects/modelviewclient/CMakeLists.txt
@@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples/remoteobjects/modelviewclient")
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/modelviewclient")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
diff --git a/examples/remoteobjects/modelviewserver/CMakeLists.txt b/examples/remoteobjects/modelviewserver/CMakeLists.txt
index dfdb56a..6471a35 100644
--- a/examples/remoteobjects/modelviewserver/CMakeLists.txt
+++ b/examples/remoteobjects/modelviewserver/CMakeLists.txt
@@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples/remoteobjects/modelviewserver")
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/modelviewserver")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
diff --git a/examples/remoteobjects/plugins/CMakeLists.txt b/examples/remoteobjects/plugins/CMakeLists.txt
index 66cbd3d..ff0c5f4 100644
--- a/examples/remoteobjects/plugins/CMakeLists.txt
+++ b/examples/remoteobjects/plugins/CMakeLists.txt
@@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples/remoteobjects/plugins/imports/TimeExample")
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/plugins/imports/TimeExample")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
diff --git a/examples/remoteobjects/qmlmodelviewclient/CMakeLists.txt b/examples/remoteobjects/qmlmodelviewclient/CMakeLists.txt
index 9d77d54..c03320a 100644
--- a/examples/remoteobjects/qmlmodelviewclient/CMakeLists.txt
+++ b/examples/remoteobjects/qmlmodelviewclient/CMakeLists.txt
@@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples/remoteobjects/qmlmodelviewclient")
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/qmlmodelviewclient")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
diff --git a/examples/remoteobjects/server/CMakeLists.txt b/examples/remoteobjects/server/CMakeLists.txt
index 161d9df..53506c7 100644
--- a/examples/remoteobjects/server/CMakeLists.txt
+++ b/examples/remoteobjects/server/CMakeLists.txt
@@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples/remoteobjects/server")
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/server")
 
 find_package(Qt6 COMPONENTS RemoteObjects)
 find_package(Qt6 COMPONENTS Core)
diff --git a/examples/remoteobjects/simpleswitch/directconnectclient/CMakeLists.txt b/examples/remoteobjects/simpleswitch/directconnectclient/CMakeLists.txt
index 641771e..bbdedd9 100644
--- a/examples/remoteobjects/simpleswitch/directconnectclient/CMakeLists.txt
+++ b/examples/remoteobjects/simpleswitch/directconnectclient/CMakeLists.txt
@@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples/remoteobjects/simpleswitch/directconnectclient")
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/simpleswitch/directconnectclient")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS RemoteObjects)
diff --git a/examples/remoteobjects/simpleswitch/directconnectdynamicclient/CMakeLists.txt b/examples/remoteobjects/simpleswitch/directconnectdynamicclient/CMakeLists.txt
index 03cebca..8818c42 100644
--- a/examples/remoteobjects/simpleswitch/directconnectdynamicclient/CMakeLists.txt
+++ b/examples/remoteobjects/simpleswitch/directconnectdynamicclient/CMakeLists.txt
@@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples/remoteobjects/simpleswitch/directconnectdynamicclient")
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/simpleswitch/directconnectdynamicclient")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS RemoteObjects)
diff --git a/examples/remoteobjects/simpleswitch/directconnectserver/CMakeLists.txt b/examples/remoteobjects/simpleswitch/directconnectserver/CMakeLists.txt
index 0eac9db..63aa555 100644
--- a/examples/remoteobjects/simpleswitch/directconnectserver/CMakeLists.txt
+++ b/examples/remoteobjects/simpleswitch/directconnectserver/CMakeLists.txt
@@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples/remoteobjects/simpleswitch/directconnectserver")
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/simpleswitch/directconnectserver")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS RemoteObjects)
diff --git a/examples/remoteobjects/simpleswitch/registryconnectedclient/CMakeLists.txt b/examples/remoteobjects/simpleswitch/registryconnectedclient/CMakeLists.txt
index 6e96a88..258c569 100644
--- a/examples/remoteobjects/simpleswitch/registryconnectedclient/CMakeLists.txt
+++ b/examples/remoteobjects/simpleswitch/registryconnectedclient/CMakeLists.txt
@@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples/remoteobjects/simpleswitch/registryconnectedclient")
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/simpleswitch/registryconnectedclient")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS RemoteObjects)
diff --git a/examples/remoteobjects/simpleswitch/registryconnectedserver/CMakeLists.txt b/examples/remoteobjects/simpleswitch/registryconnectedserver/CMakeLists.txt
index d944727..74747da 100644
--- a/examples/remoteobjects/simpleswitch/registryconnectedserver/CMakeLists.txt
+++ b/examples/remoteobjects/simpleswitch/registryconnectedserver/CMakeLists.txt
@@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples/remoteobjects/simpleswitch/registryconnectedserver")
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/simpleswitch/registryconnectedserver")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS RemoteObjects)
diff --git a/examples/remoteobjects/ssl/sslcppclient/CMakeLists.txt b/examples/remoteobjects/ssl/sslcppclient/CMakeLists.txt
index 49e9d87..d6fbe8e 100644
--- a/examples/remoteobjects/ssl/sslcppclient/CMakeLists.txt
+++ b/examples/remoteobjects/ssl/sslcppclient/CMakeLists.txt
@@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples/remoteobjects/ssl/sslcppclient")
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/ssl/sslcppclient")
 
 find_package(Qt6 COMPONENTS RemoteObjects)
 find_package(Qt6 COMPONENTS Core)
@@ -17,14 +21,11 @@ find_package(Qt6 COMPONENTS Core)
 add_executable(SslCppClient
     main.cpp
 )
-target_link_libraries(SslCppClient PRIVATE
-    Qt::RemoteObjectsPrivate
-)
-
 target_link_libraries(SslCppClient PUBLIC
     # Remove: gui
     Qt::Core
     Qt::RemoteObjects
+    Qt::RemoteObjectsPrivate
 )
 
 
diff --git a/examples/remoteobjects/ssl/sslserver/CMakeLists.txt b/examples/remoteobjects/ssl/sslserver/CMakeLists.txt
index 149bcf3..117bf5a 100644
--- a/examples/remoteobjects/ssl/sslserver/CMakeLists.txt
+++ b/examples/remoteobjects/ssl/sslserver/CMakeLists.txt
@@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples/remoteobjects/ssl/sslserver")
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/ssl/sslserver")
 
 find_package(Qt6 COMPONENTS RemoteObjects)
 find_package(Qt6 COMPONENTS Core)
@@ -19,13 +23,10 @@ add_executable(sslserver
     sslserver.cpp sslserver.h
     timemodel.cpp timemodel.h
 )
-target_link_libraries(sslserver PRIVATE
-    Qt::RemoteObjectsPrivate
-)
-
 target_link_libraries(sslserver PUBLIC
     Qt::Core
     Qt::RemoteObjects
+    Qt::RemoteObjectsPrivate
 )
 
 
diff --git a/examples/remoteobjects/websockets/wsclient/CMakeLists.txt b/examples/remoteobjects/websockets/wsclient/CMakeLists.txt
index 4deaed3..d733be6 100644
--- a/examples/remoteobjects/websockets/wsclient/CMakeLists.txt
+++ b/examples/remoteobjects/websockets/wsclient/CMakeLists.txt
@@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples/remoteobjects/websockets/wsclient")
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/websockets/wsclient")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
diff --git a/examples/remoteobjects/websockets/wsserver/CMakeLists.txt b/examples/remoteobjects/websockets/wsserver/CMakeLists.txt
index 1ce18e2..d1fe00d 100644
--- a/examples/remoteobjects/websockets/wsserver/CMakeLists.txt
+++ b/examples/remoteobjects/websockets/wsserver/CMakeLists.txt
@@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples/remoteobjects/websockets/wsserver")
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/remoteobjects/websockets/wsserver")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)