Regenerate projectswip/cmake

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

17 files changed, 74 insertions, 27 deletions

diff --git a/.cmake.conf b/.cmake.conf
new file mode 100644
index 0000000..9305480
--- /dev/null
+++ b/.cmake.conf
@@ -0,0 +1 @@
+set(QT_REPO_MODULE_VERSION "6.0.0")
diff --git a/.prev_CMakeLists.txt b/.prev_CMakeLists.txt
index 5dd17fc..cbf349a 100644
--- a/.prev_CMakeLists.txt
+++ b/.prev_CMakeLists.txt
@@ -2,8 +2,9 @@
 
 cmake_minimum_required(VERSION 3.15.0)
 
+include(.cmake.conf)
 project(QtMqtt
-    VERSION 6.0.0
+    VERSION "${QT_REPO_MODULE_VERSION}"
     DESCRIPTION "Qt Mqtt Libraries"
     HOMEPAGE_URL "https://qt.io/"
     LANGUAGES CXX C
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a1f6c8..0a3f731 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,8 +2,9 @@
 
 cmake_minimum_required(VERSION 3.15.0)
 
+include(.cmake.conf)
 project(QtMqtt
-    VERSION 6.0.0
+    VERSION "${QT_REPO_MODULE_VERSION}"
     DESCRIPTION "Qt Mqtt Libraries"
     HOMEPAGE_URL "https://qt.io/"
     LANGUAGES CXX C
diff --git a/examples/.prev_CMakeLists.txt b/examples/.prev_CMakeLists.txt
new file mode 100644
index 0000000..dfe7ee8
--- /dev/null
+++ b/examples/.prev_CMakeLists.txt
@@ -0,0 +1,7 @@
+# Generated from examples.pro.
+
+qt_examples_build_begin()
+
+add_subdirectory(mqtt)
+
+qt_examples_build_end()
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 5ea684e..dfe7ee8 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,12 +1,7 @@
-# special case begin
-qt_examples_build_begin()
-
-# special case end
-
 # Generated from examples.pro.
 
+qt_examples_build_begin()
+
 add_subdirectory(mqtt)
 
-# special case begin
 qt_examples_build_end()
-# special case end
diff --git a/examples/mqtt/consolepubsub/CMakeLists.txt b/examples/mqtt/consolepubsub/CMakeLists.txt
index f94389a..aea6a4f 100644
--- a/examples/mqtt/consolepubsub/CMakeLists.txt
+++ b/examples/mqtt/consolepubsub/CMakeLists.txt
@@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/mqtt/consolepubsub")
 
 find_package(Qt6 COMPONENTS Mqtt)
 
@@ -20,6 +24,7 @@ add_executable(qtmqtt_pub
 target_compile_definitions(qtmqtt_pub PUBLIC
     QT_DEPRECATED_WARNINGS
 )
+
 target_link_libraries(qtmqtt_pub PUBLIC
     # Remove: gui
     Qt::Mqtt
@@ -39,7 +44,11 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples")
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/mqtt/consolepubsub")
 
 find_package(Qt6 COMPONENTS Mqtt)
 
@@ -50,6 +59,7 @@ add_executable(qtmqtt_sub
 target_compile_definitions(qtmqtt_sub PUBLIC
     QT_DEPRECATED_WARNINGS
 )
+
 target_link_libraries(qtmqtt_sub PUBLIC
     # Remove: gui
     Qt::Mqtt
diff --git a/examples/mqtt/quickpublication/CMakeLists.txt b/examples/mqtt/quickpublication/CMakeLists.txt
index 3f66e35..1f0035d 100644
--- a/examples/mqtt/quickpublication/CMakeLists.txt
+++ b/examples/mqtt/quickpublication/CMakeLists.txt
@@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples/mqtt/quickpublication")
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/mqtt/quickpublication")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
diff --git a/examples/mqtt/quicksubscription/CMakeLists.txt b/examples/mqtt/quicksubscription/CMakeLists.txt
index d727623..c3bc7a8 100644
--- a/examples/mqtt/quicksubscription/CMakeLists.txt
+++ b/examples/mqtt/quicksubscription/CMakeLists.txt
@@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples/mqtt/quicksubscription")
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/mqtt/quicksubscription")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
diff --git a/examples/mqtt/simpleclient/.prev_CMakeLists.txt b/examples/mqtt/simpleclient/.prev_CMakeLists.txt
index 606fd34..5fefa15 100644
--- a/examples/mqtt/simpleclient/.prev_CMakeLists.txt
+++ b/examples/mqtt/simpleclient/.prev_CMakeLists.txt
@@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples/mqtt/simpleclient")
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/mqtt/simpleclient")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
diff --git a/examples/mqtt/simpleclient/CMakeLists.txt b/examples/mqtt/simpleclient/CMakeLists.txt
index ced1938..40d514c 100644
--- a/examples/mqtt/simpleclient/CMakeLists.txt
+++ b/examples/mqtt/simpleclient/CMakeLists.txt
@@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples/mqtt/simpleclient")
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/mqtt/simpleclient")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
diff --git a/examples/mqtt/subscriptions/CMakeLists.txt b/examples/mqtt/subscriptions/CMakeLists.txt
index b890630..b944be7 100644
--- a/examples/mqtt/subscriptions/CMakeLists.txt
+++ b/examples/mqtt/subscriptions/CMakeLists.txt
@@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples/mqtt/subscriptions")
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/mqtt/subscriptions")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
diff --git a/examples/mqtt/websocketsubscription/CMakeLists.txt b/examples/mqtt/websocketsubscription/CMakeLists.txt
index 56b398b..481abe6 100644
--- a/examples/mqtt/websocketsubscription/CMakeLists.txt
+++ b/examples/mqtt/websocketsubscription/CMakeLists.txt
@@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
-set(INSTALL_EXAMPLEDIR "examples/mqtt/websocketsubscription")
+if(NOT DEFINED INSTALL_EXAMPLESDIR)
+  set(INSTALL_EXAMPLESDIR "examples")
+endif()
+
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/mqtt/websocketsubscription")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS WebSockets)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c670977..bcce2e7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,3 @@
 # Generated from src.pro.
 
 add_subdirectory(mqtt)
-
diff --git a/src/mqtt/CMakeLists.txt b/src/mqtt/CMakeLists.txt
index e129853..312532f 100644
--- a/src/mqtt/CMakeLists.txt
+++ b/src/mqtt/CMakeLists.txt
@@ -24,6 +24,8 @@ qt_add_module(Mqtt
     PUBLIC_LIBRARIES
         Qt::Core
         Qt::Network
+    PRIVATE_MODULE_INTERFACE
+        Qt::CorePrivate
 )
 qt_add_docs(Mqtt
     doc/qtmqtt.qdocconf
diff --git a/tests/.prev_CMakeLists.txt b/tests/.prev_CMakeLists.txt
new file mode 100644
index 0000000..2214137
--- /dev/null
+++ b/tests/.prev_CMakeLists.txt
@@ -0,0 +1,7 @@
+# Generated from tests.pro.
+
+if(QT_BUILD_STANDALONE_TESTS)
+    # Add qt_find_package calls for extra dependencies that need to be found when building
+    # the standalone tests here.
+endif()
+qt_build_tests()
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 3681a62..2214137 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,10 +1,7 @@
-# special case begin
-if(NOT TARGET Qt::Test)
-    cmake_minimum_required(VERSION 3.15.0)
-    project(QtMqttTests VERSION 6.0.0 LANGUAGES C CXX)
-    find_package(Qt6 REQUIRED COMPONENTS BuildInternals Core Network Test Mqtt)
-    qt_set_up_standalone_tests_build()
-endif()
-# special case end
+# Generated from tests.pro.
 
+if(QT_BUILD_STANDALONE_TESTS)
+    # Add qt_find_package calls for extra dependencies that need to be found when building
+    # the standalone tests here.
+endif()
 qt_build_tests()
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index 5b3667f..99adccd 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -1,6 +1,9 @@
 # Generated from auto.pro.
 
-if(WIN32 OR (LINUX AND NOT cross_compile))
+if(WIN32 OR (LINUX AND NOT CMAKE_CROSSCOMPILING))
+# special case begin
+#   add_subdirectory(cmake)
+# special case end
     add_subdirectory(conformance)
     add_subdirectory(qmqttconnectionproperties)
     add_subdirectory(qmqttcontrolpacket)