From b7f99c3c4b32c0b31b73701e92bb42fbea0c83cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 4 Aug 2021 01:42:34 +0800 Subject: [PATCH] [vcpkg-cmake] Fix docs and usage of option MAYBE_UNUSED_VARIABLES (#19245) * Remove unused cmake options and MAYBE_UNUSED_VARIABLES values * Update MAYBE_UNUSED_VARIABLES docs * update version * version stuff * version stuff * update docs --- .../vcpkg-cmake/vcpkg_cmake_configure.md | 14 ++++++-- docs/maintainers/vcpkg_configure_cmake.md | 13 +++++++- ports/kf5auth/portfile.cmake | 4 --- ports/kf5auth/vcpkg.json | 1 + ports/kf5codecs/portfile.cmake | 4 --- ports/kf5codecs/vcpkg.json | 1 + ports/kf5completion/portfile.cmake | 4 --- ports/kf5completion/vcpkg.json | 1 + ports/kf5config/portfile.cmake | 4 --- ports/kf5config/vcpkg.json | 1 + ports/kf5dbusaddons/portfile.cmake | 4 --- ports/kf5dbusaddons/vcpkg.json | 1 + ports/kf5guiaddons/portfile.cmake | 4 --- ports/kf5guiaddons/vcpkg.json | 1 + ports/kf5holidays/portfile.cmake | 4 --- ports/kf5holidays/vcpkg.json | 1 + ports/kf5i18n/portfile.cmake | 4 --- ports/kf5i18n/vcpkg.json | 1 + ports/kf5itemmodels/portfile.cmake | 4 --- ports/kf5itemmodels/vcpkg.json | 1 + ports/kf5itemviews/portfile.cmake | 4 --- ports/kf5itemviews/vcpkg.json | 1 + ports/kf5plotting/portfile.cmake | 4 --- ports/kf5plotting/vcpkg.json | 1 + ports/kf5sonnet/portfile.cmake | 7 ---- ports/kf5sonnet/vcpkg.json | 1 + ports/kf5syntaxhighlighting/portfile.cmake | 4 --- ports/kf5syntaxhighlighting/vcpkg.json | 1 + ports/kf5widgetsaddons/portfile.cmake | 4 --- ports/kf5widgetsaddons/vcpkg.json | 1 + ports/kf5windowsystem/portfile.cmake | 4 --- ports/kf5windowsystem/vcpkg.json | 1 + ports/vcpkg-cmake/vcpkg.json | 2 +- ports/vcpkg-cmake/vcpkg_cmake_configure.cmake | 14 ++++++-- scripts/cmake/vcpkg_configure_cmake.cmake | 13 +++++++- versions/baseline.json | 32 +++++++++---------- versions/k-/kf5auth.json | 5 +++ versions/k-/kf5codecs.json | 5 +++ versions/k-/kf5completion.json | 5 +++ versions/k-/kf5config.json | 5 +++ versions/k-/kf5dbusaddons.json | 5 +++ versions/k-/kf5guiaddons.json | 5 +++ versions/k-/kf5holidays.json | 5 +++ versions/k-/kf5i18n.json | 5 +++ versions/k-/kf5itemmodels.json | 5 +++ versions/k-/kf5itemviews.json | 5 +++ versions/k-/kf5plotting.json | 5 +++ versions/k-/kf5sonnet.json | 5 +++ versions/k-/kf5syntaxhighlighting.json | 5 +++ versions/k-/kf5widgetsaddons.json | 5 +++ versions/k-/kf5windowsystem.json | 5 +++ versions/v-/vcpkg-cmake.json | 5 +++ 52 files changed, 160 insertions(+), 86 deletions(-) diff --git a/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_configure.md b/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_configure.md index 3745df08058..6053b363c69 100644 --- a/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_configure.md +++ b/docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_configure.md @@ -19,7 +19,7 @@ vcpkg_cmake_configure( [OPTIONS_DEBUG ...] [MAYBE_UNUSED_VARIABLES - ...] + ...] ) ``` @@ -61,7 +61,17 @@ If the library sets its own code page, pass the `NO_CHARSET_FLAG` option. This function makes certain that all options passed in are used by the underlying CMake build system. If there are options that might be unused, perhaps on certain platforms, pass those variable names to -`MAYBE_UNUSED_VARIABLES`. +`MAYBE_UNUSED_VARIABLES`. For example: +```cmake +vcpkg_cmake_configure( + ... + OPTIONS + -DBUILD_EXAMPLE=OFF + ... + MAYBE_UNUSED_VARIABLES + BUILD_EXAMPLE +) +``` `LOGFILE_BASE` is used to set the base of the logfile names; by default, this is `config`, and thus the logfiles end up being something like diff --git a/docs/maintainers/vcpkg_configure_cmake.md b/docs/maintainers/vcpkg_configure_cmake.md index fd6ce13187b..8a1eb3284a4 100644 --- a/docs/maintainers/vcpkg_configure_cmake.md +++ b/docs/maintainers/vcpkg_configure_cmake.md @@ -17,7 +17,7 @@ vcpkg_configure_cmake( [OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...] [OPTIONS_RELEASE <-DOPTIMIZE=1>...] [OPTIONS_DEBUG <-DDEBUGGABLE=1>...] - [MAYBE_UNUSED_VARIABLES ...] + [MAYBE_UNUSED_VARIABLES ...] ) ``` @@ -58,6 +58,17 @@ Additional options passed to CMake during the Debug configuration. These are in ### MAYBE_UNUSED_VARIABLES Any CMake variables which are explicitly passed in, but which may not be used on all platforms. +For example: +```cmake +vcpkg_cmake_configure( + ... + OPTIONS + -DBUILD_EXAMPLE=OFF + ... + MAYBE_UNUSED_VARIABLES + BUILD_EXAMPLE +) +``` ### LOGNAME Name of the log to write the output of the configure call to. diff --git a/ports/kf5auth/portfile.cmake b/ports/kf5auth/portfile.cmake index 439a6364b03..da48a9c9d46 100644 --- a/ports/kf5auth/portfile.cmake +++ b/ports/kf5auth/portfile.cmake @@ -13,10 +13,6 @@ vcpkg_cmake_configure( -DBUILD_TESTING=OFF -DKDE_INSTALL_PLUGINDIR=plugins -DKDE_INSTALL_DATAROOTDIR=data - MAYBE_UNUSED_VARIABLES - -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF ) diff --git a/ports/kf5auth/vcpkg.json b/ports/kf5auth/vcpkg.json index bbe7707b604..3b15b73bd52 100644 --- a/ports/kf5auth/vcpkg.json +++ b/ports/kf5auth/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5auth", "version": "5.84.0", + "port-version": 1, "description": "Execute actions as privileged user", "homepage": "https://api.kde.org/frameworks/kauth/html/index.html", "dependencies": [ diff --git a/ports/kf5codecs/portfile.cmake b/ports/kf5codecs/portfile.cmake index 8090f7f3a62..9690c58f252 100644 --- a/ports/kf5codecs/portfile.cmake +++ b/ports/kf5codecs/portfile.cmake @@ -15,10 +15,6 @@ vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} OPTIONS -DBUILD_TESTING=OFF - MAYBE_UNUSED_VARIABLES - -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF ) vcpkg_cmake_install() diff --git a/ports/kf5codecs/vcpkg.json b/ports/kf5codecs/vcpkg.json index cf86de68736..de0042d3821 100644 --- a/ports/kf5codecs/vcpkg.json +++ b/ports/kf5codecs/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5codecs", "version": "5.84.0", + "port-version": 1, "description": "String encoding library", "homepage": "https://api.kde.org/frameworks/kcodecs/html/index.html", "dependencies": [ diff --git a/ports/kf5completion/portfile.cmake b/ports/kf5completion/portfile.cmake index 281778d95a6..4bb886a3677 100644 --- a/ports/kf5completion/portfile.cmake +++ b/ports/kf5completion/portfile.cmake @@ -13,10 +13,6 @@ vcpkg_configure_cmake( OPTIONS -DBUILD_TESTING=OFF -DBUILD_DESIGNERPLUGIN=OFF - MAYBE_UNUSED_VARIABLES - -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF ) vcpkg_install_cmake() diff --git a/ports/kf5completion/vcpkg.json b/ports/kf5completion/vcpkg.json index b94ab097b6c..2849f7867f8 100644 --- a/ports/kf5completion/vcpkg.json +++ b/ports/kf5completion/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5completion", "version": "5.84.0", + "port-version": 1, "description": "Text completion helpers and widgets", "homepage": "https://api.kde.org/frameworks/kcompletion/html/index.html", "dependencies": [ diff --git a/ports/kf5config/portfile.cmake b/ports/kf5config/portfile.cmake index 2eac560f062..3e831a2b98b 100644 --- a/ports/kf5config/portfile.cmake +++ b/ports/kf5config/portfile.cmake @@ -12,10 +12,6 @@ vcpkg_configure_cmake( DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_TESTING=OFF - MAYBE_UNUSED_VARIABLES - -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF ) vcpkg_install_cmake() diff --git a/ports/kf5config/vcpkg.json b/ports/kf5config/vcpkg.json index 8e653e013f9..a2e0f26a14d 100644 --- a/ports/kf5config/vcpkg.json +++ b/ports/kf5config/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5config", "version": "5.84.0", + "port-version": 1, "description": "Configuration system", "homepage": "https://api.kde.org/frameworks/kconfig/html/index.html", "dependencies": [ diff --git a/ports/kf5dbusaddons/portfile.cmake b/ports/kf5dbusaddons/portfile.cmake index 3f29ad5a301..372773c44d6 100644 --- a/ports/kf5dbusaddons/portfile.cmake +++ b/ports/kf5dbusaddons/portfile.cmake @@ -11,10 +11,6 @@ vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} OPTIONS -DBUILD_TESTING=OFF - MAYBE_UNUSED_VARIABLES - -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF ) vcpkg_cmake_install() diff --git a/ports/kf5dbusaddons/vcpkg.json b/ports/kf5dbusaddons/vcpkg.json index e2739f505b1..c545dc94a4a 100644 --- a/ports/kf5dbusaddons/vcpkg.json +++ b/ports/kf5dbusaddons/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5dbusaddons", "version": "5.84.0", + "port-version": 1, "description": "Convenience classes for D-Bus", "homepage": "https://api.kde.org/frameworks/kdbusaddons/html/index.html", "dependencies": [ diff --git a/ports/kf5guiaddons/portfile.cmake b/ports/kf5guiaddons/portfile.cmake index fea154b3e2c..fbe95894160 100644 --- a/ports/kf5guiaddons/portfile.cmake +++ b/ports/kf5guiaddons/portfile.cmake @@ -23,10 +23,6 @@ vcpkg_configure_cmake( -DBUILD_TESTING=OFF -DQtWaylandScanner_EXECUTABLE=${CURRENT_INSTALLED_DIR}/tools/qt5-wayland/bin/qtwaylandscanner ${FEATURE_OPTIONS} - MAYBE_UNUSED_VARIABLES - -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF ) vcpkg_install_cmake() diff --git a/ports/kf5guiaddons/vcpkg.json b/ports/kf5guiaddons/vcpkg.json index 6e976e621aa..871117156ce 100644 --- a/ports/kf5guiaddons/vcpkg.json +++ b/ports/kf5guiaddons/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5guiaddons", "version": "5.84.0", + "port-version": 1, "description": "Addons to QtGui", "homepage": "https://api.kde.org/frameworks/kguiaddons/html/index.html", "dependencies": [ diff --git a/ports/kf5holidays/portfile.cmake b/ports/kf5holidays/portfile.cmake index 332fff5d6f4..765d752300d 100644 --- a/ports/kf5holidays/portfile.cmake +++ b/ports/kf5holidays/portfile.cmake @@ -12,10 +12,6 @@ vcpkg_configure_cmake( DISABLE_PARALLEL_CONFIGURE OPTIONS -DBUILD_TESTING=OFF - MAYBE_UNUSED_VARIABLES - -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF ) vcpkg_install_cmake() diff --git a/ports/kf5holidays/vcpkg.json b/ports/kf5holidays/vcpkg.json index 8102c2a2746..1d79a711193 100644 --- a/ports/kf5holidays/vcpkg.json +++ b/ports/kf5holidays/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5holidays", "version": "5.84.0", + "port-version": 1, "description": "Holiday calculation library", "dependencies": [ "ecm", diff --git a/ports/kf5i18n/portfile.cmake b/ports/kf5i18n/portfile.cmake index 5b4b0a6015f..21851c16393 100644 --- a/ports/kf5i18n/portfile.cmake +++ b/ports/kf5i18n/portfile.cmake @@ -15,10 +15,6 @@ vcpkg_configure_cmake( -DBUILD_TESTING=OFF -DKDE_INSTALL_PLUGINDIR=plugins -DPYTHON_EXECUTABLE=${PYTHON3} - MAYBE_UNUSED_VARIABLES - -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF ) vcpkg_install_cmake() diff --git a/ports/kf5i18n/vcpkg.json b/ports/kf5i18n/vcpkg.json index 80a2eefe6e5..fb1c47e8a3c 100644 --- a/ports/kf5i18n/vcpkg.json +++ b/ports/kf5i18n/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5i18n", "version": "5.84.0", + "port-version": 1, "description": "Advanced internationalization framework", "homepage": "https://api.kde.org/frameworks/ki18n/html/index.html", "dependencies": [ diff --git a/ports/kf5itemmodels/portfile.cmake b/ports/kf5itemmodels/portfile.cmake index 8b21d00a231..a45b13bbba4 100644 --- a/ports/kf5itemmodels/portfile.cmake +++ b/ports/kf5itemmodels/portfile.cmake @@ -12,10 +12,6 @@ vcpkg_configure_cmake( OPTIONS -DBUILD_TESTING=OFF -DKDE_INSTALL_QMLDIR=qml - MAYBE_UNUSED_VARIABLES - -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF ) vcpkg_install_cmake() diff --git a/ports/kf5itemmodels/vcpkg.json b/ports/kf5itemmodels/vcpkg.json index 452486d6391..5022b2142c9 100644 --- a/ports/kf5itemmodels/vcpkg.json +++ b/ports/kf5itemmodels/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5itemmodels", "version": "5.84.0", + "port-version": 1, "description": "Models for Qt Model/View system", "homepage": "https://api.kde.org/frameworks/kitemmodels/html/index.html", "dependencies": [ diff --git a/ports/kf5itemviews/portfile.cmake b/ports/kf5itemviews/portfile.cmake index e7b98662467..51707dd62ca 100644 --- a/ports/kf5itemviews/portfile.cmake +++ b/ports/kf5itemviews/portfile.cmake @@ -12,10 +12,6 @@ vcpkg_configure_cmake( OPTIONS -DBUILD_TESTING=OFF -DBUILD_DESIGNERPLUGIN=OFF - MAYBE_UNUSED_VARIABLES - -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF ) vcpkg_install_cmake() diff --git a/ports/kf5itemviews/vcpkg.json b/ports/kf5itemviews/vcpkg.json index 7dcfa823fe8..f7e41014927 100644 --- a/ports/kf5itemviews/vcpkg.json +++ b/ports/kf5itemviews/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5itemviews", "version": "5.84.0", + "port-version": 1, "description": "Widget addons for Qt Model/View", "homepage": "https://api.kde.org/frameworks/kitemviews/html/index.html", "dependencies": [ diff --git a/ports/kf5plotting/portfile.cmake b/ports/kf5plotting/portfile.cmake index eb3b58f3518..9897fb89b79 100644 --- a/ports/kf5plotting/portfile.cmake +++ b/ports/kf5plotting/portfile.cmake @@ -12,10 +12,6 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS -DBUILD_TESTING=OFF - MAYBE_UNUSED_VARIABLES - -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF ) vcpkg_install_cmake() diff --git a/ports/kf5plotting/vcpkg.json b/ports/kf5plotting/vcpkg.json index cd7824cea11..7a99dc14549 100644 --- a/ports/kf5plotting/vcpkg.json +++ b/ports/kf5plotting/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5plotting", "version": "5.84.0", + "port-version": 1, "description": "Lightweight plotting framework", "homepage": "https://api.kde.org/frameworks/kplotting/html/index.html", "dependencies": [ diff --git a/ports/kf5sonnet/portfile.cmake b/ports/kf5sonnet/portfile.cmake index 5710d63b7a5..2cdff734d2a 100644 --- a/ports/kf5sonnet/portfile.cmake +++ b/ports/kf5sonnet/portfile.cmake @@ -14,13 +14,6 @@ vcpkg_cmake_configure( -DKDE_INSTALL_PLUGINDIR=plugins -DKDE_INSTALL_DATAROOTDIR=data -DKDE_INSTALL_QTPLUGINDIR=plugins - -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF - MAYBE_UNUSED_VARIABLES - BUILD_HTML_DOCS - BUILD_MAN_DOCS - BUILD_QTHELP_DOCS ) vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/bin") diff --git a/ports/kf5sonnet/vcpkg.json b/ports/kf5sonnet/vcpkg.json index 8f4b783ce3c..d9d0f1173a9 100644 --- a/ports/kf5sonnet/vcpkg.json +++ b/ports/kf5sonnet/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5sonnet", "version-semver": "5.84.0", + "port-version": 1, "description": "Multi-language spell checker", "homepage": "https://api.kde.org/frameworks/sonnet/html/index.html", "dependencies": [ diff --git a/ports/kf5syntaxhighlighting/portfile.cmake b/ports/kf5syntaxhighlighting/portfile.cmake index a91422b9e6b..1453c26d8c4 100644 --- a/ports/kf5syntaxhighlighting/portfile.cmake +++ b/ports/kf5syntaxhighlighting/portfile.cmake @@ -16,10 +16,6 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS -DBUILD_TESTING=OFF - MAYBE_UNUSED_VARIABLES - -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF ) vcpkg_install_cmake(ADD_BIN_TO_PATH) diff --git a/ports/kf5syntaxhighlighting/vcpkg.json b/ports/kf5syntaxhighlighting/vcpkg.json index 441e3e7f591..5c4cb98a72b 100644 --- a/ports/kf5syntaxhighlighting/vcpkg.json +++ b/ports/kf5syntaxhighlighting/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5syntaxhighlighting", "version": "5.84.0", + "port-version": 1, "description": "Syntax highlighting engine for Kate syntax definitions", "homepage": "https://github.com/KDE/syntax-highlighting", "dependencies": [ diff --git a/ports/kf5widgetsaddons/portfile.cmake b/ports/kf5widgetsaddons/portfile.cmake index 3802aedd48f..453397dadf7 100644 --- a/ports/kf5widgetsaddons/portfile.cmake +++ b/ports/kf5widgetsaddons/portfile.cmake @@ -13,10 +13,6 @@ vcpkg_configure_cmake( OPTIONS -DBUILD_TESTING=OFF -DBUILD_DESIGNERPLUGIN=OFF - MAYBE_UNUSED_VARIABLES - -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF ) vcpkg_install_cmake() diff --git a/ports/kf5widgetsaddons/vcpkg.json b/ports/kf5widgetsaddons/vcpkg.json index b73d659ed57..23429f98328 100644 --- a/ports/kf5widgetsaddons/vcpkg.json +++ b/ports/kf5widgetsaddons/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5widgetsaddons", "version": "5.84.0", + "port-version": 1, "description": "Addons to QtWidgets", "homepage": "https://api.kde.org/frameworks/kwidgetsaddons/html/index.html", "dependencies": [ diff --git a/ports/kf5windowsystem/portfile.cmake b/ports/kf5windowsystem/portfile.cmake index 7873721cbb1..1c15090b2d5 100644 --- a/ports/kf5windowsystem/portfile.cmake +++ b/ports/kf5windowsystem/portfile.cmake @@ -16,10 +16,6 @@ vcpkg_configure_cmake( OPTIONS -DBUILD_TESTING=OFF -DKDE_INSTALL_PLUGINDIR=plugins - MAYBE_UNUSED_VARIABLES - -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF ) vcpkg_install_cmake() diff --git a/ports/kf5windowsystem/vcpkg.json b/ports/kf5windowsystem/vcpkg.json index 34a21787a00..40ea4209d56 100644 --- a/ports/kf5windowsystem/vcpkg.json +++ b/ports/kf5windowsystem/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5windowsystem", "version": "5.84.0", + "port-version": 1, "description": "Access to the windowing system", "homepage": "https://api.kde.org/frameworks/kwindowsystem/html/", "dependencies": [ diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json index f7d28a5665c..96134a85035 100644 --- a/ports/vcpkg-cmake/vcpkg.json +++ b/ports/vcpkg-cmake/vcpkg.json @@ -1,4 +1,4 @@ { "name": "vcpkg-cmake", - "version-date": "2021-07-26" + "version-date": "2021-07-30" } diff --git a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake index 889fa8c0962..801db016640 100644 --- a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake +++ b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake @@ -18,7 +18,7 @@ vcpkg_cmake_configure( [OPTIONS_DEBUG ...] [MAYBE_UNUSED_VARIABLES - ...] + ...] ) ``` @@ -60,7 +60,17 @@ If the library sets its own code page, pass the `NO_CHARSET_FLAG` option. This function makes certain that all options passed in are used by the underlying CMake build system. If there are options that might be unused, perhaps on certain platforms, pass those variable names to -`MAYBE_UNUSED_VARIABLES`. +`MAYBE_UNUSED_VARIABLES`. For example: +```cmake +vcpkg_cmake_configure( + ... + OPTIONS + -DBUILD_EXAMPLE=OFF + ... + MAYBE_UNUSED_VARIABLES + BUILD_EXAMPLE +) +``` `LOGFILE_BASE` is used to set the base of the logfile names; by default, this is `config`, and thus the logfiles end up being something like diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index 56bf9bd5766..0377ae5dd8c 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -15,7 +15,7 @@ vcpkg_configure_cmake( [OPTIONS <-DUSE_THIS_IN_ALL_BUILDS=1>...] [OPTIONS_RELEASE <-DOPTIMIZE=1>...] [OPTIONS_DEBUG <-DDEBUGGABLE=1>...] - [MAYBE_UNUSED_VARIABLES ...] + [MAYBE_UNUSED_VARIABLES ...] ) ``` @@ -56,6 +56,17 @@ Additional options passed to CMake during the Debug configuration. These are in ### MAYBE_UNUSED_VARIABLES Any CMake variables which are explicitly passed in, but which may not be used on all platforms. +For example: +```cmake +vcpkg_cmake_configure( + ... + OPTIONS + -DBUILD_EXAMPLE=OFF + ... + MAYBE_UNUSED_VARIABLES + BUILD_EXAMPLE +) +``` ### LOGNAME Name of the log to write the output of the configure call to. diff --git a/versions/baseline.json b/versions/baseline.json index 23329bde0bd..2327eb7dab4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2866,19 +2866,19 @@ }, "kf5auth": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5codecs": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5completion": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5config": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5coreaddons": { "baseline": "5.84.0", @@ -2890,27 +2890,27 @@ }, "kf5dbusaddons": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5guiaddons": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5holidays": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5i18n": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5itemmodels": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5itemviews": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5jobwidgets": { "baseline": "5.84.0", @@ -2918,7 +2918,7 @@ }, "kf5plotting": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5solid": { "baseline": "5.84.0", @@ -2926,19 +2926,19 @@ }, "kf5sonnet": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5syntaxhighlighting": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5widgetsaddons": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kf5windowsystem": { "baseline": "5.84.0", - "port-version": 0 + "port-version": 1 }, "kfr": { "baseline": "2020-06-15", @@ -6581,7 +6581,7 @@ "port-version": 0 }, "vcpkg-cmake": { - "baseline": "2021-07-26", + "baseline": "2021-07-30", "port-version": 0 }, "vcpkg-cmake-config": { diff --git a/versions/k-/kf5auth.json b/versions/k-/kf5auth.json index 21cfce4e5b2..acaa00c199a 100644 --- a/versions/k-/kf5auth.json +++ b/versions/k-/kf5auth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5f1399e14100a7c100bc55f8d436224c680a7f52", + "version": "5.84.0", + "port-version": 1 + }, { "git-tree": "09194a3548898b6548ab3e61e45a9f6a4388aa6e", "version": "5.84.0", diff --git a/versions/k-/kf5codecs.json b/versions/k-/kf5codecs.json index c6c6664cf20..544d164b30c 100644 --- a/versions/k-/kf5codecs.json +++ b/versions/k-/kf5codecs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cc839f57cba8b67ed071d5dc3a472b605033cd7a", + "version": "5.84.0", + "port-version": 1 + }, { "git-tree": "b0b56e3e645427bfc9efe47c4050ba295e5e261e", "version": "5.84.0", diff --git a/versions/k-/kf5completion.json b/versions/k-/kf5completion.json index 34ae35a1883..6192590e9f4 100644 --- a/versions/k-/kf5completion.json +++ b/versions/k-/kf5completion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b32643e981f1d9bab04fd3526e9c6c4499d35d1f", + "version": "5.84.0", + "port-version": 1 + }, { "git-tree": "0ffa13221ac2980b44af52cae6392718f80f5d3f", "version": "5.84.0", diff --git a/versions/k-/kf5config.json b/versions/k-/kf5config.json index 58c153aee65..69d611da1f9 100644 --- a/versions/k-/kf5config.json +++ b/versions/k-/kf5config.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "67fa669df81328489ba66231cef84fc17ae4f434", + "version": "5.84.0", + "port-version": 1 + }, { "git-tree": "57c0ad579f0582463fe73a7ca64f1af6eadcea16", "version": "5.84.0", diff --git a/versions/k-/kf5dbusaddons.json b/versions/k-/kf5dbusaddons.json index 8121d563f32..1c4e812e83f 100644 --- a/versions/k-/kf5dbusaddons.json +++ b/versions/k-/kf5dbusaddons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "417fdf58b130c7e24794cf4d1d29336cb946f9fa", + "version": "5.84.0", + "port-version": 1 + }, { "git-tree": "d7d33a4c88aa692230617ecc58693dbaa3290ba7", "version": "5.84.0", diff --git a/versions/k-/kf5guiaddons.json b/versions/k-/kf5guiaddons.json index 4446fe71372..723eed36763 100644 --- a/versions/k-/kf5guiaddons.json +++ b/versions/k-/kf5guiaddons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7413c9e8bfa4e7db669271b3c13fe5cf7c52567a", + "version": "5.84.0", + "port-version": 1 + }, { "git-tree": "13acc7a53a47646048061054946bcce0f8acbf7b", "version": "5.84.0", diff --git a/versions/k-/kf5holidays.json b/versions/k-/kf5holidays.json index 0fa15a94be1..b2fca6bd611 100644 --- a/versions/k-/kf5holidays.json +++ b/versions/k-/kf5holidays.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b969d43d406c095970b4e98cc3b19c27567b557c", + "version": "5.84.0", + "port-version": 1 + }, { "git-tree": "a43e4fcc0dedd0d8f6722386a97a688c001fa508", "version": "5.84.0", diff --git a/versions/k-/kf5i18n.json b/versions/k-/kf5i18n.json index 8b467a806c7..b880dc638d1 100644 --- a/versions/k-/kf5i18n.json +++ b/versions/k-/kf5i18n.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f0d01fec0fb56e9c2d95b743b0b13e544d5428a7", + "version": "5.84.0", + "port-version": 1 + }, { "git-tree": "08dd3d175400c8e6f91fc3d7f6cbc7eff8a3e976", "version": "5.84.0", diff --git a/versions/k-/kf5itemmodels.json b/versions/k-/kf5itemmodels.json index 6be47b0b0f1..b498ce49793 100644 --- a/versions/k-/kf5itemmodels.json +++ b/versions/k-/kf5itemmodels.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b222a404755239053edfac06ee63bf3710719fe9", + "version": "5.84.0", + "port-version": 1 + }, { "git-tree": "2efa93694b3389e09de76095a6fa35ce41b30f2d", "version": "5.84.0", diff --git a/versions/k-/kf5itemviews.json b/versions/k-/kf5itemviews.json index fc2b3fa7713..3e9fe713557 100644 --- a/versions/k-/kf5itemviews.json +++ b/versions/k-/kf5itemviews.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "164cc5f1d9ccfdf89ef60c4b718b8f6777162ea5", + "version": "5.84.0", + "port-version": 1 + }, { "git-tree": "257c4740f00dab4e0c650543f7cec08b395bcceb", "version": "5.84.0", diff --git a/versions/k-/kf5plotting.json b/versions/k-/kf5plotting.json index 688441bb9ee..7a594e4f98e 100644 --- a/versions/k-/kf5plotting.json +++ b/versions/k-/kf5plotting.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "39f28709c5b4d6e1c706c7e15617b7c052830122", + "version": "5.84.0", + "port-version": 1 + }, { "git-tree": "b105a7f2a86040a1a7b5622371d7c0d5cd65fd16", "version": "5.84.0", diff --git a/versions/k-/kf5sonnet.json b/versions/k-/kf5sonnet.json index 78e3c649f27..c5cd6b7ebd0 100644 --- a/versions/k-/kf5sonnet.json +++ b/versions/k-/kf5sonnet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "de4fdcac67da4df0962414b4b1f71d98753d4c4e", + "version-semver": "5.84.0", + "port-version": 1 + }, { "git-tree": "7f6d9ebeec45c6354fd96f1ee04b9e34063e33b0", "version-semver": "5.84.0", diff --git a/versions/k-/kf5syntaxhighlighting.json b/versions/k-/kf5syntaxhighlighting.json index 56edfa52c1f..706ca85fb99 100644 --- a/versions/k-/kf5syntaxhighlighting.json +++ b/versions/k-/kf5syntaxhighlighting.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0bec703b0c5345b456bdbddf6e043d1c31dd2906", + "version": "5.84.0", + "port-version": 1 + }, { "git-tree": "6033609633223323ffc8762d0e2a6ab24c323de7", "version": "5.84.0", diff --git a/versions/k-/kf5widgetsaddons.json b/versions/k-/kf5widgetsaddons.json index 088d33ee00b..77880f2902c 100644 --- a/versions/k-/kf5widgetsaddons.json +++ b/versions/k-/kf5widgetsaddons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "de99d19b892fe1551e87c6dd3a1c2d353bfc3f76", + "version": "5.84.0", + "port-version": 1 + }, { "git-tree": "f27e6f9ba66090bf93b9db1bbf3973d472bd9627", "version": "5.84.0", diff --git a/versions/k-/kf5windowsystem.json b/versions/k-/kf5windowsystem.json index 536c431dad2..091e5c1e5ee 100644 --- a/versions/k-/kf5windowsystem.json +++ b/versions/k-/kf5windowsystem.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "719b81cebad63502bbb619781290844c586acef9", + "version": "5.84.0", + "port-version": 1 + }, { "git-tree": "178fa49af1a113118be6d61a68c31930aa276e17", "version": "5.84.0", diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json index 02a8816c1ab..086edd0208c 100644 --- a/versions/v-/vcpkg-cmake.json +++ b/versions/v-/vcpkg-cmake.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c6df7e0faeda9e783175746c7c440c9bc2bdb111", + "version-date": "2021-07-30", + "port-version": 0 + }, { "git-tree": "ae2178d81ee39baf4c7e9fd6ed3f011b01a93635", "version-date": "2021-07-26",