diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2021-08-04 01:42:34 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-03 10:42:34 -0700 |
| commit | b7f99c3c4b32c0b31b73701e92bb42fbea0c83cb (patch) | |
| tree | 422b04540845543cf9666f3673b35c7d0043d1b2 /ports | |
| parent | a863c84812089836a3c0f2f215ab3e2579fc8acf (diff) | |
| download | vcpkg-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
Diffstat (limited to 'ports')
32 files changed, 28 insertions, 66 deletions
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 |
