aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Baryshev <dmitrymq@gmail.com>2021-03-26 21:42:13 +0300
committerGitHub <noreply@github.com>2021-03-26 11:42:13 -0700
commita4782d3fac641020b9d1f5c96114a1e9c1c713fc (patch)
treeba536b3196749a967ba16c151fb3ecd83857e98d
parentf351aed6b8b3f494479d283aa39e02d5f64ca628 (diff)
downloadvcpkg-a4782d3fac641020b9d1f5c96114a1e9c1c713fc.tar.gz
vcpkg-a4782d3fac641020b9d1f5c96114a1e9c1c713fc.zip
[sail] Update 0.9.0-pre11 -> 0.9.0-pre12 (#16806)
* [sail] update to v0.9.0-pre12 * [sail] update usage * [sail] move C++ configs * [sail] use new 0.9.0-pre12 tag * [sail] vcpkg x-add-version sail * [sail] version-string -> version-semver * [sail] vcpkg x-add-version sail --overwrite-version * [sail] Update port version to 1 * [sail] vcpkg x-add-version sail --overwrite-version * [sail] Update versions/s-/sail.json Co-authored-by: Robert Schumacher <roschuma@microsoft.com> Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
-rw-r--r--ports/sail/portfile.cmake13
-rw-r--r--ports/sail/usage2
-rw-r--r--ports/sail/vcpkg.json3
-rw-r--r--versions/baseline.json4
-rw-r--r--versions/s-/sail.json5
5 files changed, 21 insertions, 6 deletions
diff --git a/ports/sail/portfile.cmake b/ports/sail/portfile.cmake
index e2ea7f15e..490951bc1 100644
--- a/ports/sail/portfile.cmake
+++ b/ports/sail/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_fail_port_install(ON_TARGET "UWP")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO smoked-herring/sail
- REF a7b8cdb
- SHA512 402b0e05ce99b5abeebf695a132121cc59789834d5a296ffada34fa3090c16ffc2266e98393e10136e31480b2378b966a8a48a153240f43b0196d986316aa9df
+ REF v0.9.0-pre12
+ SHA512 2082c9715b101fd15b698bc85dd3af2c47233325ddea2852fe3abcd0c456a8fd9e915fbec5c30e4c2c53bf159f843ecebf88f80f23fe0b5365a0b030f36ede5c
HEAD_REF master
)
@@ -42,5 +42,14 @@ else()
file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
endif()
+# Move C++ configs
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/${PORT}c++)
+
+file(GLOB SAIL_CPP_CONFIGS "${CURRENT_PACKAGES_DIR}/share/${PORT}/SailC++*")
+foreach(SAIL_CPP_CONFIG IN LISTS SAIL_CPP_CONFIGS)
+ get_filename_component(SAIL_CPP_CONFIG_NAME "${SAIL_CPP_CONFIG}" NAME)
+ file(RENAME ${SAIL_CPP_CONFIG} ${CURRENT_PACKAGES_DIR}/share/${PORT}c++/${SAIL_CPP_CONFIG_NAME})
+endforeach()
+
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/sail/usage b/ports/sail/usage
index 672b735e9..bf901e2e8 100644
--- a/ports/sail/usage
+++ b/ports/sail/usage
@@ -7,5 +7,5 @@ C libraries:
C++ bindings:
- find_package(Sail CONFIG REQUIRED)
+ find_package(SailC++ CONFIG REQUIRED)
target_link_libraries(main PRIVATE SAIL::sail-c++)
diff --git a/ports/sail/vcpkg.json b/ports/sail/vcpkg.json
index 72ad2a0ef..dc591f10e 100644
--- a/ports/sail/vcpkg.json
+++ b/ports/sail/vcpkg.json
@@ -1,6 +1,7 @@
{
"name": "sail",
- "version-string": "0.9.0-pre11",
+ "version-semver": "0.9.0-pre12",
+ "port-version": 1,
"description": "The missing small and fast image decoding library for humans (not for machines)",
"homepage": "https://github.com/smoked-herring/sail",
"supports": "!uwp",
diff --git a/versions/baseline.json b/versions/baseline.json
index d6c81d6d0..dd3dcd327 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5305,8 +5305,8 @@
"port-version": 0
},
"sail": {
- "baseline": "0.9.0-pre11",
- "port-version": 0
+ "baseline": "0.9.0-pre12",
+ "port-version": 1
},
"sais": {
"baseline": "2.4.1-1",
diff --git a/versions/s-/sail.json b/versions/s-/sail.json
index 86f1f99b5..25eb657d3 100644
--- a/versions/s-/sail.json
+++ b/versions/s-/sail.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "5494cae319135c06b4ce8d6150c90e148fb6c924",
+ "version-semver": "0.9.0-pre12",
+ "port-version": 1
+ },
+ {
"git-tree": "d3e3d2b48fde38bfc70d3b7cec2c667866a41d48",
"version-string": "0.9.0-pre11",
"port-version": 0