1
0
mirror of https://github.com/qt/qtmqtt.git synced 2026-10-25 16:16:26 +00:00

CMake: Regenerate projects

And use an updated coin instruction file.

Change-Id: I852d38febe9ecaa86c516b7f4a0451d0f80d8011
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
This commit is contained in:
Alexandru Croitor 2020-05-26 17:39:11 +02:00
parent a450023285
commit 5ea20cc458
3 changed files with 24 additions and 10 deletions

View File

@ -1,13 +1,12 @@
version: 1
version: 2
accept_configuration:
condition: property
property: host.os
equals_property: target.os
property: features
not_contains_value: Disable
build_instructions:
- !include "{{qt/qtbase}}/prepare_building_env.yaml"
- !include "{{qt/qtbase}}/cmake_module_build_instructions.yaml"
- !include "{{qt/qtbase}}/cmake_build_and_upload_test_artifacts.yaml"
instructions:
Build:
- !include "{{qt/qtbase}}/coin_module_build_template_v2.yaml"
test_instructions:
- !include "{{qt/qtbase}}/cmake_regular_test_instructions.yaml"
Test:
- !include "{{qt/qtbase}}/coin_module_test_template_v2.yaml"

View File

@ -1,7 +1,7 @@
# Generated from mqtt.pro.
add_subdirectory(consolepubsub)
if(TARGET Qt::Gui)
if(TARGET Qt::Gui AND TARGET Qt::Widgets)
add_subdirectory(simpleclient)
add_subdirectory(subscriptions)
endif()

View File

@ -0,0 +1,15 @@
# Generated from auto.pro.
if(WIN32 OR (LINUX AND NOT CMAKE_CROSSCOMPILING))
add_subdirectory(cmake)
add_subdirectory(conformance)
add_subdirectory(qmqttconnectionproperties)
add_subdirectory(qmqttcontrolpacket)
add_subdirectory(qmqttclient)
add_subdirectory(qmqttlastwillproperties)
add_subdirectory(qmqttpublishproperties)
add_subdirectory(qmqttsubscription)
add_subdirectory(qmqttsubscriptionproperties)
add_subdirectory(qmqtttopicname)
add_subdirectory(qmqtttopicfilter)
endif()