aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>2021-08-04 01:42:34 +0800
committerGitHub <noreply@github.com>2021-08-03 10:42:34 -0700
commitb7f99c3c4b32c0b31b73701e92bb42fbea0c83cb (patch)
tree422b04540845543cf9666f3673b35c7d0043d1b2
parenta863c84812089836a3c0f2f215ab3e2579fc8acf (diff)
downloadvcpkg-b7f99c3c4b32c0b31b73701e92bb42fbea0c83cb.tar.gz
vcpkg-b7f99c3c4b32c0b31b73701e92bb42fbea0c83cb.zip
[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
-rw-r--r--docs/maintainers/ports/vcpkg-cmake/vcpkg_cmake_configure.md14
-rw-r--r--docs/maintainers/vcpkg_configure_cmake.md13
-rw-r--r--ports/kf5auth/portfile.cmake4
-rw-r--r--ports/kf5auth/vcpkg.json1
-rw-r--r--ports/kf5codecs/portfile.cmake4
-rw-r--r--ports/kf5codecs/vcpkg.json1
-rw-r--r--ports/kf5completion/portfile.cmake4
-rw-r--r--ports/kf5completion/vcpkg.json1
-rw-r--r--ports/kf5config/portfile.cmake4
-rw-r--r--ports/kf5config/vcpkg.json1
-rw-r--r--ports/kf5dbusaddons/portfile.cmake4
-rw-r--r--ports/kf5dbusaddons/vcpkg.json1
-rw-r--r--ports/kf5guiaddons/portfile.cmake4
-rw-r--r--ports/kf5guiaddons/vcpkg.json1
-rw-r--r--ports/kf5holidays/portfile.cmake4
-rw-r--r--ports/kf5holidays/vcpkg.json1
-rw-r--r--ports/kf5i18n/portfile.cmake4
-rw-r--r--ports/kf5i18n/vcpkg.json1
-rw-r--r--ports/kf5itemmodels/portfile.cmake4
-rw-r--r--ports/kf5itemmodels/vcpkg.json1
-rw-r--r--ports/kf5itemviews/portfile.cmake4
-rw-r--r--ports/kf5itemviews/vcpkg.json1
-rw-r--r--ports/kf5plotting/portfile.cmake4
-rw-r--r--ports/kf5plotting/vcpkg.json1
-rw-r--r--ports/kf5sonnet/portfile.cmake7
-rw-r--r--ports/kf5sonnet/vcpkg.json1
-rw-r--r--ports/kf5syntaxhighlighting/portfile.cmake4
-rw-r--r--ports/kf5syntaxhighlighting/vcpkg.json1
-rw-r--r--ports/kf5widgetsaddons/portfile.cmake4
-rw-r--r--ports/kf5widgetsaddons/vcpkg.json1
-rw-r--r--ports/kf5windowsystem/portfile.cmake4
-rw-r--r--ports/kf5windowsystem/vcpkg.json1
-rw-r--r--ports/vcpkg-cmake/vcpkg.json2
-rw-r--r--ports/vcpkg-cmake/vcpkg_cmake_configure.cmake14
-rw-r--r--scripts/cmake/vcpkg_configure_cmake.cmake13
-rw-r--r--versions/baseline.json32
-rw-r--r--versions/k-/kf5auth.json5
-rw-r--r--versions/k-/kf5codecs.json5
-rw-r--r--versions/k-/kf5completion.json5
-rw-r--r--versions/k-/kf5config.json5
-rw-r--r--versions/k-/kf5dbusaddons.json5
-rw-r--r--versions/k-/kf5guiaddons.json5
-rw-r--r--versions/k-/kf5holidays.json5
-rw-r--r--versions/k-/kf5i18n.json5
-rw-r--r--versions/k-/kf5itemmodels.json5
-rw-r--r--versions/k-/kf5itemviews.json5
-rw-r--r--versions/k-/kf5plotting.json5
-rw-r--r--versions/k-/kf5sonnet.json5
-rw-r--r--versions/k-/kf5syntaxhighlighting.json5
-rw-r--r--versions/k-/kf5widgetsaddons.json5
-rw-r--r--versions/k-/kf5windowsystem.json5
-rw-r--r--versions/v-/vcpkg-cmake.json5
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 3745df080..6053b363c 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
<configure-setting>...]
[MAYBE_UNUSED_VARIABLES
- <variable-name>...]
+ <option-name>...]
)
```
@@ -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 fd6ce1318..8a1eb3284 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 <option-name>...]
+ [MAYBE_UNUSED_VARIABLES <OPTION_NAME>...]
)
```
@@ -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 439a6364b..da48a9c9d 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 bbe7707b6..3b15b73bd 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 8090f7f3a..9690c58f2 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 cf86de687..de0042d38 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 281778d95..4bb886a36 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 b94ab097b..2849f7867 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 2eac560f0..3e831a2b9 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 8e653e013..a2e0f26a1 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 3f29ad5a3..372773c44 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 e2739f505..c545dc94a 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 fea154b3e..fbe958941 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 6e976e621..871117156 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 332fff5d6..765d75230 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 8102c2a27..1d79a7111 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 5b4b0a601..21851c163 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 80a2eefe6..fb1c47e8a 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 8b21d00a2..a45b13bbb 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 452486d63..5022b2142 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 e7b986624..51707dd62 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 7dcfa823f..f7e410149 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 eb3b58f35..9897fb89b 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 cd7824cea..7a99dc145 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 5710d63b7..2cdff734d 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 8f4b783ce..d9d0f1173 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 a91422b9e..1453c26d8 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 441e3e7f5..5c4cb98a7 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 3802aedd4..453397dad 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 b73d659ed..23429f983 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 7873721cb..1c15090b2 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 34a21787a..40ea4209d 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 f7d28a566..96134a850 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 889fa8c09..801db0166 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
<configure-setting>...]
[MAYBE_UNUSED_VARIABLES
- <variable-name>...]
+ <option-name>...]
)
```
@@ -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 56bf9bd57..0377ae5dd 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 <option-name>...]
+ [MAYBE_UNUSED_VARIABLES <OPTION_NAME>...]
)
```
@@ -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 23329bde0..2327eb7da 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 21cfce4e5..acaa00c19 100644
--- a/versions/k-/kf5auth.json
+++ b/versions/k-/kf5auth.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "5f1399e14100a7c100bc55f8d436224c680a7f52",
+ "version": "5.84.0",
+ "port-version": 1
+ },
+ {
"git-tree": "09194a3548898b6548ab3e61e45a9f6a4388aa6e",
"version": "5.84.0",
"port-version": 0
diff --git a/versions/k-/kf5codecs.json b/versions/k-/kf5codecs.json
index c6c6664cf..544d164b3 100644
--- a/versions/k-/kf5codecs.json
+++ b/versions/k-/kf5codecs.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "cc839f57cba8b67ed071d5dc3a472b605033cd7a",
+ "version": "5.84.0",
+ "port-version": 1
+ },
+ {
"git-tree": "b0b56e3e645427bfc9efe47c4050ba295e5e261e",
"version": "5.84.0",
"port-version": 0
diff --git a/versions/k-/kf5completion.json b/versions/k-/kf5completion.json
index 34ae35a18..6192590e9 100644
--- a/versions/k-/kf5completion.json
+++ b/versions/k-/kf5completion.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "b32643e981f1d9bab04fd3526e9c6c4499d35d1f",
+ "version": "5.84.0",
+ "port-version": 1
+ },
+ {
"git-tree": "0ffa13221ac2980b44af52cae6392718f80f5d3f",
"version": "5.84.0",
"port-version": 0
diff --git a/versions/k-/kf5config.json b/versions/k-/kf5config.json
index 58c153aee..69d611da1 100644
--- a/versions/k-/kf5config.json
+++ b/versions/k-/kf5config.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "67fa669df81328489ba66231cef84fc17ae4f434",
+ "version": "5.84.0",
+ "port-version": 1
+ },
+ {
"git-tree": "57c0ad579f0582463fe73a7ca64f1af6eadcea16",
"version": "5.84.0",
"port-version": 0
diff --git a/versions/k-/kf5dbusaddons.json b/versions/k-/kf5dbusaddons.json
index 8121d563f..1c4e812e8 100644
--- a/versions/k-/kf5dbusaddons.json
+++ b/versions/k-/kf5dbusaddons.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "417fdf58b130c7e24794cf4d1d29336cb946f9fa",
+ "version": "5.84.0",
+ "port-version": 1
+ },
+ {
"git-tree": "d7d33a4c88aa692230617ecc58693dbaa3290ba7",
"version": "5.84.0",
"port-version": 0
diff --git a/versions/k-/kf5guiaddons.json b/versions/k-/kf5guiaddons.json
index 4446fe713..723eed367 100644
--- a/versions/k-/kf5guiaddons.json
+++ b/versions/k-/kf5guiaddons.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "7413c9e8bfa4e7db669271b3c13fe5cf7c52567a",
+ "version": "5.84.0",
+ "port-version": 1
+ },
+ {
"git-tree": "13acc7a53a47646048061054946bcce0f8acbf7b",
"version": "5.84.0",
"port-version": 0
diff --git a/versions/k-/kf5holidays.json b/versions/k-/kf5holidays.json
index 0fa15a94b..b2fca6bd6 100644
--- a/versions/k-/kf5holidays.json
+++ b/versions/k-/kf5holidays.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "b969d43d406c095970b4e98cc3b19c27567b557c",
+ "version": "5.84.0",
+ "port-version": 1
+ },
+ {
"git-tree": "a43e4fcc0dedd0d8f6722386a97a688c001fa508",
"version": "5.84.0",
"port-version": 0
diff --git a/versions/k-/kf5i18n.json b/versions/k-/kf5i18n.json
index 8b467a806..b880dc638 100644
--- a/versions/k-/kf5i18n.json
+++ b/versions/k-/kf5i18n.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "f0d01fec0fb56e9c2d95b743b0b13e544d5428a7",
+ "version": "5.84.0",
+ "port-version": 1
+ },
+ {
"git-tree": "08dd3d175400c8e6f91fc3d7f6cbc7eff8a3e976",
"version": "5.84.0",
"port-version": 0
diff --git a/versions/k-/kf5itemmodels.json b/versions/k-/kf5itemmodels.json
index 6be47b0b0..b498ce497 100644
--- a/versions/k-/kf5itemmodels.json
+++ b/versions/k-/kf5itemmodels.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "b222a404755239053edfac06ee63bf3710719fe9",
+ "version": "5.84.0",
+ "port-version": 1
+ },
+ {
"git-tree": "2efa93694b3389e09de76095a6fa35ce41b30f2d",
"version": "5.84.0",
"port-version": 0
diff --git a/versions/k-/kf5itemviews.json b/versions/k-/kf5itemviews.json
index fc2b3fa77..3e9fe7135 100644
--- a/versions/k-/kf5itemviews.json
+++ b/versions/k-/kf5itemviews.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "164cc5f1d9ccfdf89ef60c4b718b8f6777162ea5",
+ "version": "5.84.0",
+ "port-version": 1
+ },
+ {
"git-tree": "257c4740f00dab4e0c650543f7cec08b395bcceb",
"version": "5.84.0",
"port-version": 0
diff --git a/versions/k-/kf5plotting.json b/versions/k-/kf5plotting.json
index 688441bb9..7a594e4f9 100644
--- a/versions/k-/kf5plotting.json
+++ b/versions/k-/kf5plotting.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "39f28709c5b4d6e1c706c7e15617b7c052830122",
+ "version": "5.84.0",
+ "port-version": 1
+ },
+ {
"git-tree": "b105a7f2a86040a1a7b5622371d7c0d5cd65fd16",
"version": "5.84.0",
"port-version": 0
diff --git a/versions/k-/kf5sonnet.json b/versions/k-/kf5sonnet.json
index 78e3c649f..c5cd6b7eb 100644
--- a/versions/k-/kf5sonnet.json
+++ b/versions/k-/kf5sonnet.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "de4fdcac67da4df0962414b4b1f71d98753d4c4e",
+ "version-semver": "5.84.0",
+ "port-version": 1
+ },
+ {
"git-tree": "7f6d9ebeec45c6354fd96f1ee04b9e34063e33b0",
"version-semver": "5.84.0",
"port-version": 0
diff --git a/versions/k-/kf5syntaxhighlighting.json b/versions/k-/kf5syntaxhighlighting.json
index 56edfa52c..706ca85fb 100644
--- a/versions/k-/kf5syntaxhighlighting.json
+++ b/versions/k-/kf5syntaxhighlighting.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "0bec703b0c5345b456bdbddf6e043d1c31dd2906",
+ "version": "5.84.0",
+ "port-version": 1
+ },
+ {
"git-tree": "6033609633223323ffc8762d0e2a6ab24c323de7",
"version": "5.84.0",
"port-version": 0
diff --git a/versions/k-/kf5widgetsaddons.json b/versions/k-/kf5widgetsaddons.json
index 088d33ee0..77880f290 100644
--- a/versions/k-/kf5widgetsaddons.json
+++ b/versions/k-/kf5widgetsaddons.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "de99d19b892fe1551e87c6dd3a1c2d353bfc3f76",
+ "version": "5.84.0",
+ "port-version": 1
+ },
+ {
"git-tree": "f27e6f9ba66090bf93b9db1bbf3973d472bd9627",
"version": "5.84.0",
"port-version": 0
diff --git a/versions/k-/kf5windowsystem.json b/versions/k-/kf5windowsystem.json
index 536c431da..091e5c1e5 100644
--- a/versions/k-/kf5windowsystem.json
+++ b/versions/k-/kf5windowsystem.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "719b81cebad63502bbb619781290844c586acef9",
+ "version": "5.84.0",
+ "port-version": 1
+ },
+ {
"git-tree": "178fa49af1a113118be6d61a68c31930aa276e17",
"version": "5.84.0",
"port-version": 0
diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json
index 02a8816c1..086edd020 100644
--- a/versions/v-/vcpkg-cmake.json
+++ b/versions/v-/vcpkg-cmake.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "c6df7e0faeda9e783175746c7c440c9bc2bdb111",
+ "version-date": "2021-07-30",
+ "port-version": 0
+ },
+ {
"git-tree": "ae2178d81ee39baf4c7e9fd6ed3f011b01a93635",
"version-date": "2021-07-26",
"port-version": 0