diff options
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/mqtt/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/auto/conformance/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/qmqttclient/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/qmqttconnectionproperties/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/qmqttcontrolpacket/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/qmqttlastwillproperties/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/qmqttpublishproperties/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/qmqttsubscription/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/qmqttsubscriptionproperties/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/qmqtttopicfilter/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/qmqtttopicname/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/manual/sslconfiguration/CMakeLists.txt | 14 |
16 files changed, 3 insertions, 49 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2db82b3..254a730 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qtmqtt.pro. - cmake_minimum_required(VERSION 3.16) include(.cmake.conf) @@ -13,7 +11,7 @@ project(QtMqtt LANGUAGES CXX C ) -find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core Network) # special case -find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS Quick WebSockets # For tests # special case - Gui Widgets) # For examples # special case +find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core Network) +find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS Quick WebSockets # For tests + Gui Widgets) # For examples qt_build_repo() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2f8e5ae..78fb9bf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,4 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from src.pro. - add_subdirectory(mqtt) diff --git a/src/mqtt/CMakeLists.txt b/src/mqtt/CMakeLists.txt index fbc4ab2..f31cf6f 100644 --- a/src/mqtt/CMakeLists.txt +++ b/src/mqtt/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from mqtt.pro. - ##################################################################### ## Mqtt Module: ##################################################################### diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 800bc26..05cc44c 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# 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. diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index 266aa7a..03c4e86 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -1,12 +1,8 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from auto.pro. - 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) diff --git a/tests/auto/conformance/CMakeLists.txt b/tests/auto/conformance/CMakeLists.txt index 94f2a3e..e4dbadd 100644 --- a/tests/auto/conformance/CMakeLists.txt +++ b/tests/auto/conformance/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from conformance.pro. - ##################################################################### ## tst_conformance Test: ##################################################################### diff --git a/tests/auto/qmqttclient/CMakeLists.txt b/tests/auto/qmqttclient/CMakeLists.txt index bee2d5f..d3db01f 100644 --- a/tests/auto/qmqttclient/CMakeLists.txt +++ b/tests/auto/qmqttclient/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qmqttclient.pro. - ##################################################################### ## tst_qmqttclient Test: ##################################################################### diff --git a/tests/auto/qmqttconnectionproperties/CMakeLists.txt b/tests/auto/qmqttconnectionproperties/CMakeLists.txt index f019a87..f177c59 100644 --- a/tests/auto/qmqttconnectionproperties/CMakeLists.txt +++ b/tests/auto/qmqttconnectionproperties/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qmqttconnectionproperties.pro. - ##################################################################### ## tst_qmqttconnectionproperties Test: ##################################################################### diff --git a/tests/auto/qmqttcontrolpacket/CMakeLists.txt b/tests/auto/qmqttcontrolpacket/CMakeLists.txt index bf8d170..755803b 100644 --- a/tests/auto/qmqttcontrolpacket/CMakeLists.txt +++ b/tests/auto/qmqttcontrolpacket/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qmqttcontrolpacket.pro. - ##################################################################### ## tst_qmqttcontrolpacket Test: ##################################################################### diff --git a/tests/auto/qmqttlastwillproperties/CMakeLists.txt b/tests/auto/qmqttlastwillproperties/CMakeLists.txt index 6447c3f..610d298 100644 --- a/tests/auto/qmqttlastwillproperties/CMakeLists.txt +++ b/tests/auto/qmqttlastwillproperties/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qmqttlastwillproperties.pro. - ##################################################################### ## tst_qmqttlastwillproperties Test: ##################################################################### diff --git a/tests/auto/qmqttpublishproperties/CMakeLists.txt b/tests/auto/qmqttpublishproperties/CMakeLists.txt index 9b2d9c7..3ee0f0f 100644 --- a/tests/auto/qmqttpublishproperties/CMakeLists.txt +++ b/tests/auto/qmqttpublishproperties/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qmqttpublishproperties.pro. - ##################################################################### ## tst_qmqttpublishproperties Test: ##################################################################### diff --git a/tests/auto/qmqttsubscription/CMakeLists.txt b/tests/auto/qmqttsubscription/CMakeLists.txt index 084a2dd..4966d97 100644 --- a/tests/auto/qmqttsubscription/CMakeLists.txt +++ b/tests/auto/qmqttsubscription/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qmqttsubscription.pro. - ##################################################################### ## tst_qmqttsubscription Test: ##################################################################### diff --git a/tests/auto/qmqttsubscriptionproperties/CMakeLists.txt b/tests/auto/qmqttsubscriptionproperties/CMakeLists.txt index a6f77a6..2ee2a36 100644 --- a/tests/auto/qmqttsubscriptionproperties/CMakeLists.txt +++ b/tests/auto/qmqttsubscriptionproperties/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qmqttsubscriptionproperties.pro. - ##################################################################### ## tst_qmqttsubscriptionproperties Test: ##################################################################### diff --git a/tests/auto/qmqtttopicfilter/CMakeLists.txt b/tests/auto/qmqtttopicfilter/CMakeLists.txt index bceae34..ee1a19b 100644 --- a/tests/auto/qmqtttopicfilter/CMakeLists.txt +++ b/tests/auto/qmqtttopicfilter/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qmqtttopicfilter.pro. - ##################################################################### ## tst_qmqtttopicfilter Test: ##################################################################### diff --git a/tests/auto/qmqtttopicname/CMakeLists.txt b/tests/auto/qmqtttopicname/CMakeLists.txt index 62b5930..142d3aa 100644 --- a/tests/auto/qmqtttopicname/CMakeLists.txt +++ b/tests/auto/qmqtttopicname/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qmqtttopicname.pro. - ##################################################################### ## tst_qmqtttopicname Test: ##################################################################### diff --git a/tests/manual/sslconfiguration/CMakeLists.txt b/tests/manual/sslconfiguration/CMakeLists.txt index 0ea8172..ff5f0b3 100644 --- a/tests/manual/sslconfiguration/CMakeLists.txt +++ b/tests/manual/sslconfiguration/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from sslconfiguration.pro. - ##################################################################### ## sslconfiguration Binary: ##################################################################### @@ -16,15 +14,3 @@ qt_add_manual_test(sslconfiguration Qt::Mqtt Qt::Network ) - -## Scopes: -##################################################################### - -#### Keys ignored in scope 2:.:.:sslconfiguration.pro:QNX: -# target.path = "/tmp/$${TARGET}/bin" - -#### Keys ignored in scope 4:.:.:sslconfiguration.pro:UNIX AND NOT ANDROID: -# target.path = "/opt/$${TARGET}/bin" - -#### Keys ignored in scope 5:.:.:sslconfiguration.pro:NOT target.path_ISEMPTY: -# INSTALLS = "target" |