aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>2021-03-16 02:06:19 +0800
committerGitHub <noreply@github.com>2021-03-15 11:06:19 -0700
commitd1c007555858a9ddb91a012304e438036dd1ebfc (patch)
tree7df0a0e39790fa09e4e28a4e702a021e692decdc
parent924ad6ad6c7c36161a5eb6d89f221971b3e76dfe (diff)
downloadvcpkg-d1c007555858a9ddb91a012304e438036dd1ebfc.tar.gz
vcpkg-d1c007555858a9ddb91a012304e438036dd1ebfc.zip
[sundials] Update to 5.7.0 and also update repository (#16705)
* [sundials] Update to 5.7.0 and also update repository * Update versions * Update OPTIONS * Update versions/s-/sundials.json
-rw-r--r--ports/sundials/CONTROL4
-rw-r--r--ports/sundials/portfile.cmake17
-rw-r--r--ports/sundials/vcpkg.json6
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/s-/sundials.json5
5 files changed, 18 insertions, 16 deletions
diff --git a/ports/sundials/CONTROL b/ports/sundials/CONTROL
deleted file mode 100644
index fdd491a61..000000000
--- a/ports/sundials/CONTROL
+++ /dev/null
@@ -1,4 +0,0 @@
-Source: sundials
-Version: 5.5.0
-Homepage: https://computation.llnl.gov/projects/sundials
-Description: SUNDIALS (SUite of Nonlinear and DIfferential/ALgebraic equation Solvers)
diff --git a/ports/sundials/portfile.cmake b/ports/sundials/portfile.cmake
index 9a5886f65..3af735a68 100644
--- a/ports/sundials/portfile.cmake
+++ b/ports/sundials/portfile.cmake
@@ -1,14 +1,9 @@
-set(ARCHIVE_NAME "sundials-5.5.0")
-
-vcpkg_download_distfile(ARCHIVE
- URLS "https://computation.llnl.gov/projects/sundials/download/${ARCHIVE_NAME}.tar.gz"
- FILENAME "${ARCHIVE_NAME}.tar.gz"
- SHA512 e8cba7341f6b8d647151fe5543e62a13adda363d4c96bdaba7a70925b2c58ec4f4f089a0d6c9c5a57c50fb32fa1285bd09b450697056bc3da24cf882c6c7c427
-)
-
-vcpkg_extract_source_archive_ex(
+vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
- ARCHIVE ${ARCHIVE}
+ REPO LLNL/sundials
+ REF 73c280cd55ca2b42019c8a9aa54af10e41e27b9d # v5.7.0
+ SHA512 c70c53e5f5efe47255d23f36e71ffd75d61905a13a634a26bfbbd43c3c8764b7805db9a8cbe48c6cf69b2a1028701cb7118074bbbc01de71faf4f30bf0be22f9
+ HEAD_REF master
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SUN_BUILD_STATIC)
@@ -18,7 +13,7 @@ vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
- -DEXAMPLES_ENABLE=OFF
+ -D_BUILD_EXAMPLES=OFF
-DBUILD_STATIC_LIBS=${SUN_BUILD_STATIC}
-DBUILD_SHARED_LIBS=${SUN_BUILD_SHARED}
)
diff --git a/ports/sundials/vcpkg.json b/ports/sundials/vcpkg.json
new file mode 100644
index 000000000..5985a6115
--- /dev/null
+++ b/ports/sundials/vcpkg.json
@@ -0,0 +1,6 @@
+{
+ "name": "sundials",
+ "version-semver": "5.7.0",
+ "description": "SUNDIALS (SUite of Nonlinear and DIfferential/ALgebraic equation Solvers)",
+ "homepage": "https://computation.llnl.gov/projects/sundials"
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index ef4c1960c..0f57ce3c2 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5697,7 +5697,7 @@
"port-version": 1
},
"sundials": {
- "baseline": "5.5.0",
+ "baseline": "5.7.0",
"port-version": 0
},
"superlu": {
diff --git a/versions/s-/sundials.json b/versions/s-/sundials.json
index 88fb5475a..98f64958b 100644
--- a/versions/s-/sundials.json
+++ b/versions/s-/sundials.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "f6b0c03d6b78a5632db68b010ab4d9526c73450c",
+ "version-semver": "5.7.0",
+ "port-version": 0
+ },
+ {
"git-tree": "8d36ea64574b793b164d015845c69e6278168ba5",
"version-string": "5.5.0",
"port-version": 0