aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchausner <15180557+chausner@users.noreply.github.com>2021-10-12 05:14:35 +0200
committerGitHub <noreply@github.com>2021-10-11 20:14:35 -0700
commit7e3c65d4a39c294538f7e82550724da80d4365dd (patch)
treee8cce2640cf7f449c69033eb46dc44a1a55e0283
parentd444c7886a846d3a07423047d5c03958c1e5bbf1 (diff)
downloadvcpkg-7e3c65d4a39c294538f7e82550724da80d4365dd.tar.gz
vcpkg-7e3c65d4a39c294538f7e82550724da80d4365dd.zip
[optional-lite] Update to 3.5.0 (#20625)
* Update optional-lite to 3.5.0 * Update CI baseline Co-authored-by: chausner <chausner@users.noreply.github.com>
-rw-r--r--ports/optional-lite/portfile.cmake21
-rw-r--r--ports/optional-lite/vcpkg.json16
-rw-r--r--versions/baseline.json4
-rw-r--r--versions/o-/optional-lite.json5
4 files changed, 30 insertions, 16 deletions
diff --git a/ports/optional-lite/portfile.cmake b/ports/optional-lite/portfile.cmake
index 1817a54a9..1bf0762b5 100644
--- a/ports/optional-lite/portfile.cmake
+++ b/ports/optional-lite/portfile.cmake
@@ -1,29 +1,28 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO martinmoene/optional-lite
- REF v3.2.0
- SHA512 7c3f93dc718953118ab18edb55f6c8dc1555febb6ee491d3f7df4a8d06aba245bbfba31883a711995bb6b8d6de9f44c805cbba44b9e322f3bb5c3272106f66ec
+ REF v3.5.0
+ SHA512 E578D391BC95E2A5302B4B02E0B17659026B2743FC5C1E16CD83F6227FA9B5990FA3FA23E808A4EA0F5BDAFBF80834B0C462D563AB615907F113EE5A09AE88F5
)
-vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}
- PREFER_NINJA
+vcpkg_cmake_configure(
+ SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DOPTIONAL_LITE_OPT_BUILD_TESTS=OFF
-DOPTIONAL_LITE_OPT_BUILD_EXAMPLES=OFF
)
-vcpkg_install_cmake()
+vcpkg_cmake_install()
-vcpkg_fixup_cmake_targets(
- CONFIG_PATH lib/cmake/${PORT}
+vcpkg_cmake_config_fixup(
+ CONFIG_PATH "lib/cmake/${PORT}"
)
file(REMOVE_RECURSE
- ${CURRENT_PACKAGES_DIR}/debug
- ${CURRENT_PACKAGES_DIR}/lib
+ "${CURRENT_PACKAGES_DIR}/debug"
+ "${CURRENT_PACKAGES_DIR}/lib"
)
file(INSTALL
- ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright
+ "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright
)
diff --git a/ports/optional-lite/vcpkg.json b/ports/optional-lite/vcpkg.json
index 452f75670..ce1df3fe3 100644
--- a/ports/optional-lite/vcpkg.json
+++ b/ports/optional-lite/vcpkg.json
@@ -1,6 +1,16 @@
{
"name": "optional-lite",
- "version-string": "3.2.0",
- "port-version": 1,
- "description": "A C++17-like optional, a nullable object for C++98, C++11 and later in a single-file header-only library"
+ "version": "3.5.0",
+ "description": "A C++17-like optional, a nullable object for C++98, C++11 and later in a single-file header-only library",
+ "homepage": "https://github.com/martinmoene/optional-lite",
+ "dependencies": [
+ {
+ "name": "vcpkg-cmake",
+ "host": true
+ },
+ {
+ "name": "vcpkg-cmake-config",
+ "host": true
+ }
+ ]
}
diff --git a/versions/baseline.json b/versions/baseline.json
index ced1b09bc..74267b5dd 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4937,8 +4937,8 @@
"port-version": 1
},
"optional-lite": {
- "baseline": "3.2.0",
- "port-version": 1
+ "baseline": "3.5.0",
+ "port-version": 0
},
"opus": {
"baseline": "1.3.1",
diff --git a/versions/o-/optional-lite.json b/versions/o-/optional-lite.json
index 4f2c3b260..4ed173bfb 100644
--- a/versions/o-/optional-lite.json
+++ b/versions/o-/optional-lite.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "121b3133b75062823ca1c6d41b22019c4bc78999",
+ "version": "3.5.0",
+ "port-version": 0
+ },
+ {
"git-tree": "d6434c7b71c70b8ce50c3a1cc38aa35afc9bdf73",
"version-string": "3.2.0",
"port-version": 1