Modernize example's CMakeLists.txt

* Use qt_standard_project_setup()
* Use Qt6:: prefix, instead of Qt::
* Use private linkage wherever possible

Pick-to: 6.5
Change-Id: I8af4fdeed78f7cba26308f1c7932e6f9fc256ade
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

6 files changed, 34 insertions, 35 deletions

diff --git a/examples/opcua/CMakeLists.txt b/examples/opcua/CMakeLists.txt
index 075c6eb..b60d8bc 100644
--- a/examples/opcua/CMakeLists.txt
+++ b/examples/opcua/CMakeLists.txt
@@ -1,12 +1,12 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-if(TARGET Qt::Widgets)
+if(TARGET Qt6::Widgets)
     qt_internal_add_example(opcuaviewer)
 endif()
 if(QT_FEATURE_gds AND QT_FEATURE_ssl AND NOT APPLE AND NOT WINRT)
     qt_internal_add_example(x509)
 endif()
-if(QT_FEATURE_open62541 AND TARGET Qt::Quick)
+if(QT_FEATURE_open62541 AND TARGET Qt6::Quick)
     add_subdirectory(waterpump)
 endif()
diff --git a/examples/opcua/opcuaviewer/CMakeLists.txt b/examples/opcua/opcuaviewer/CMakeLists.txt
index 2f7b5ab..08776be 100644
--- a/examples/opcua/opcuaviewer/CMakeLists.txt
+++ b/examples/opcua/opcuaviewer/CMakeLists.txt
@@ -4,9 +4,6 @@
 cmake_minimum_required(VERSION 3.16)
 project(opcuaviewer LANGUAGES CXX)
 
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-
 if(NOT DEFINED INSTALL_EXAMPLESDIR)
     set(INSTALL_EXAMPLESDIR "examples")
 endif()
@@ -15,6 +12,8 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/opcua/opcuaviewer")
 
 find_package(Qt6 REQUIRED COMPONENTS Core Gui OpcUa Widgets)
 
+qt_standard_project_setup()
+
 file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/pki"
     DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
 
@@ -31,11 +30,11 @@ set_target_properties(opcuaviewer PROPERTIES
     MACOSX_BUNDLE TRUE
 )
 
-target_link_libraries(opcuaviewer PUBLIC
-    Qt::Core
-    Qt::Gui
-    Qt::OpcUa
-    Qt::Widgets
+target_link_libraries(opcuaviewer PRIVATE
+    Qt6::Core
+    Qt6::Gui
+    Qt6::OpcUa
+    Qt6::Widgets
 )
 
 install(TARGETS opcuaviewer
diff --git a/examples/opcua/waterpump/simulationserver/CMakeLists.txt b/examples/opcua/waterpump/simulationserver/CMakeLists.txt
index c84297c..8befc71 100644
--- a/examples/opcua/waterpump/simulationserver/CMakeLists.txt
+++ b/examples/opcua/waterpump/simulationserver/CMakeLists.txt
@@ -4,8 +4,6 @@
 cmake_minimum_required(VERSION 3.16)
 project(simulationserver LANGUAGES CXX C)
 
-set(CMAKE_AUTOMOC ON)
-
 if(NOT DEFINED INSTALL_EXAMPLESDIR)
     set(INSTALL_EXAMPLESDIR "examples")
 endif()
@@ -14,6 +12,8 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/opcua/waterpump/simulationserver"
 
 find_package(Qt6 REQUIRED COMPONENTS Core OpcUa)
 
+qt_standard_project_setup()
+
 if (EXISTS ../../../../../../../${QT_REPO_MODULE_VERSION}/Automation/sources/qtopcua/)
     set(MODULE_SOURCE ../../../../../../../${QT_REPO_MODULE_VERSION}/Automation/sources/qtopcua/)
 else()
@@ -32,14 +32,14 @@ set_target_properties(simulationserver PROPERTIES
     MACOSX_BUNDLE TRUE
 )
 
-target_include_directories(simulationserver PUBLIC
+target_include_directories(simulationserver PRIVATE
     ${MODULE_SOURCE}/src/plugins/opcua/open62541
 )
 
-target_link_libraries(simulationserver PUBLIC
-    Qt::Core
-    Qt::OpcUa
-    Qt::OpcUaPrivate
+target_link_libraries(simulationserver PRIVATE
+    Qt6::Core
+    Qt6::OpcUa
+    Qt6::OpcUaPrivate
 )
 
 if (QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541)
diff --git a/examples/opcua/waterpump/waterpump-qml/CMakeLists.txt b/examples/opcua/waterpump/waterpump-qml/CMakeLists.txt
index d0430c1..3d8bd92 100644
--- a/examples/opcua/waterpump/waterpump-qml/CMakeLists.txt
+++ b/examples/opcua/waterpump/waterpump-qml/CMakeLists.txt
@@ -4,8 +4,6 @@
 cmake_minimum_required(VERSION 3.16)
 project(waterpump-qml LANGUAGES CXX)
 
-set(CMAKE_AUTOMOC ON)
-
 if(NOT DEFINED INSTALL_EXAMPLESDIR)
     set(INSTALL_EXAMPLESDIR "examples")
 endif()
@@ -14,6 +12,8 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/opcua/waterpump/waterpump-qml")
 
 find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick)
 
+qt_standard_project_setup()
+
 qt_add_executable(waterpump-qml
     main.cpp
 )
@@ -23,10 +23,10 @@ set_target_properties(waterpump-qml PROPERTIES
     MACOSX_BUNDLE TRUE
 )
 
-target_link_libraries(waterpump-qml PUBLIC
-    Qt::Core
-    Qt::Gui
-    Qt::Quick
+target_link_libraries(waterpump-qml PRIVATE
+    Qt6::Core
+    Qt6::Gui
+    Qt6::Quick
 )
 
 # Resources:
diff --git a/examples/opcua/waterpump/waterpump-qmlcpp/CMakeLists.txt b/examples/opcua/waterpump/waterpump-qmlcpp/CMakeLists.txt
index c4378bb..4cd865e 100644
--- a/examples/opcua/waterpump/waterpump-qmlcpp/CMakeLists.txt
+++ b/examples/opcua/waterpump/waterpump-qmlcpp/CMakeLists.txt
@@ -4,8 +4,6 @@
 cmake_minimum_required(VERSION 3.16)
 project(waterpump-qmlcpp LANGUAGES CXX)
 
-set(CMAKE_AUTOMOC ON)
-
 if(NOT DEFINED INSTALL_EXAMPLESDIR)
     set(INSTALL_EXAMPLESDIR "examples")
 endif()
@@ -14,6 +12,8 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/opcua/waterpump/waterpump-qmlcpp"
 
 find_package(Qt6 REQUIRED COMPONENTS Core Gui OpcUa Quick)
 
+qt_standard_project_setup()
+
 qt_add_executable(waterpump-qmlcpp
     main.cpp
     opcuamachinebackend.cpp opcuamachinebackend.h
@@ -24,11 +24,11 @@ set_target_properties(waterpump-qmlcpp PROPERTIES
     MACOSX_BUNDLE TRUE
 )
 
-target_link_libraries(waterpump-qmlcpp PUBLIC
-    Qt::Core
-    Qt::Gui
-    Qt::OpcUa
-    Qt::Quick
+target_link_libraries(waterpump-qmlcpp PRIVATE
+    Qt6::Core
+    Qt6::Gui
+    Qt6::OpcUa
+    Qt6::Quick
 )
 
 # Resources:
diff --git a/examples/opcua/x509/CMakeLists.txt b/examples/opcua/x509/CMakeLists.txt
index 88f25d6..25f4e33 100644
--- a/examples/opcua/x509/CMakeLists.txt
+++ b/examples/opcua/x509/CMakeLists.txt
@@ -4,8 +4,6 @@
 cmake_minimum_required(VERSION 3.16)
 project(x509 LANGUAGES CXX)
 
-set(CMAKE_AUTOMOC ON)
-
 if(NOT DEFINED INSTALL_EXAMPLESDIR)
     set(INSTALL_EXAMPLESDIR "examples")
 endif()
@@ -14,6 +12,8 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/opcua/x509")
 
 find_package(Qt6 REQUIRED COMPONENTS Core OpcUa)
 
+qt_standard_project_setup()
+
 qt_add_executable(x509
     main.cpp
 )
@@ -23,9 +23,9 @@ set_target_properties(x509 PROPERTIES
     MACOSX_BUNDLE TRUE
 )
 
-target_link_libraries(x509 PUBLIC
-    Qt::Core
-    Qt::OpcUa
+target_link_libraries(x509 PRIVATE
+    Qt6::Core
+    Qt6::OpcUa
 )
 
 install(TARGETS x509