diff options
| author | nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com> | 2021-07-14 14:45:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-14 12:45:18 -0700 |
| commit | d369df7ecf194005eaca46f07368779cd486badd (patch) | |
| tree | 419f9861b796a7dc6e53646df13642c6c71108f2 /ports/qt5-mqtt | |
| parent | 932df5b8ede16b73fc5508445140d5b360ea0c68 (diff) | |
| download | vcpkg-d369df7ecf194005eaca46f07368779cd486badd.tar.gz vcpkg-d369df7ecf194005eaca46f07368779cd486badd.zip | |
[rollup:2021-07-06] Rollup PR (#18838)
* [rollup:2021-07-06 1/8] PR #18272 (@strega-nil)
[scripts-audit] vcpkg_from_*
* [rollup:2021-07-06 2/8] PR #18319 (@strega-nil)
[scripts-audit] add guidelines for cmake
* [rollup 2021-07-06 3/8] PR #18410 (@mheyman)
[vcpkg-cmake-config] documentation fix
* [rollup:2021-07-06 4/8] PR #18488 (@strega-nil)
[scripts-audit] vcpkg_execute_*
* [rollup:2021-07-06 5/8] PR #18517 (@strega-nil)
[scripts-audit] vcpkg_extract_source_archive
* [rollup:2021-07-06 6/8] PR #18674 (@NancyLi1013)
[vcpkg doc] Update examples
* [rollup:2021-07-06 7/8] PR #18695 (@JackBoosY)
[vcpkg] Update the minimum version of vcpkg
* [rollup:2021-07-06 8/8] PR #18758 (@ras0219-msft)
[vcpkg_from_git] Fix error if downloads folder does not exist
* build docs!
* fix bond:*-windows
* fix nmap
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: Michael Heyman <Michael.Heyman@jhuapl.edu>
Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Robert Schumacher <ras0219@outlook.com>
Diffstat (limited to 'ports/qt5-mqtt')
| -rw-r--r-- | ports/qt5-mqtt/CONTROL | 4 | ||||
| -rw-r--r-- | ports/qt5-mqtt/portfile.cmake | 9 | ||||
| -rw-r--r-- | ports/qt5-mqtt/vcpkg.json | 12 |
3 files changed, 16 insertions, 9 deletions
diff --git a/ports/qt5-mqtt/CONTROL b/ports/qt5-mqtt/CONTROL deleted file mode 100644 index eeb831a9f..000000000 --- a/ports/qt5-mqtt/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: qt5-mqtt
-Version: 5.15.2
-Description: Qt5 MQTT module.
-Build-Depends: qt5-base[core]
diff --git a/ports/qt5-mqtt/portfile.cmake b/ports/qt5-mqtt/portfile.cmake index 77ef1144b..ca6e25d0d 100644 --- a/ports/qt5-mqtt/portfile.cmake +++ b/ports/qt5-mqtt/portfile.cmake @@ -1,20 +1,19 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
#qt_submodule_installation() No binary package for this port.
if(QT_UPDATE_VERSION)
- set(UPDATE_PORT_GIT_OPTIONS X_OUT_REF NEW_REF) # TO get an SHA512 error if the variable is set.
+ set(VCPKG_USE_HEAD_VERSION ON)
endif()
vcpkg_from_git(
OUT_SOURCE_PATH SOURCE_PATH
URL git://code.qt.io/qt/qtmqtt.git
- TAG v${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}
REF ${QT_HASH_${PORT}}
- ${UPDATE_PORT_GIT_OPTIONS}
+ HEAD_REF "v${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}"
PATCHES ${_qis_PATCHES}
)
-if(NEW_REF)
- message(STATUS "New qtmqtt ref: ${NEW_REF}")
+if(QT_UPDATE_VERSION)
+ message(STATUS "New qtmqtt ref: ${VCPKG_HEAD_VERSION}")
endif()
# qt module builds from a git repository require a .git entry to invoke syncqt
diff --git a/ports/qt5-mqtt/vcpkg.json b/ports/qt5-mqtt/vcpkg.json new file mode 100644 index 000000000..c4dac430a --- /dev/null +++ b/ports/qt5-mqtt/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "qt5-mqtt", + "version": "5.15.2", + "port-version": 1, + "description": "Qt5 MQTT module.", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + } + ] +} |