Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SUNDIALS] Update to 5.5.0 #14618

Merged
merged 14 commits into from
Nov 18, 2020
Merged

[SUNDIALS] Update to 5.5.0 #14618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
af1ba4c
[lua] update to 5.4.1
JonLiu1993 Oct 29, 2020
4138044
Merge branch 'master' of https://github.com/Microsoft/vcpkg
JonLiu1993 Oct 30, 2020
03a685a
Merge branch 'master' of https://github.com/Microsoft/vcpkg
JonLiu1993 Nov 9, 2020
9a7e7ae
Merge branch 'master' of https://github.com/Microsoft/vcpkg
JonLiu1993 Nov 10, 2020
06c77a4
Handling lua file conflicts
JonLiu1993 Nov 10, 2020
8839d8b
Merge branch 'master' of https://github.com/Microsoft/vcpkg
JonLiu1993 Nov 12, 2020
fd1351d
Merge branch 'master' of https://github.com/Microsoft/vcpkg
JonLiu1993 Nov 13, 2020
afdd8e2
Merge branch 'master' of https://github.com/Microsoft/vcpkg
JonLiu1993 Nov 17, 2020
4cde66a
Merge branch 'master' of https://github.com/Microsoft/vcpkg
JonLiu1993 Nov 18, 2020
acb4096
[SUNDIALS] Update to 5.5.0
JonLiu1993 Nov 18, 2020
ee4df27
Handling lua file conflicts
JonLiu1993 Nov 18, 2020
97ffd99
Merge branch 'master' of https://github.com/Microsoft/vcpkg
JonLiu1993 Nov 18, 2020
a4ee19b
Merge branch 'master' of https://github.com/JonLiu1993/vcpkg into dev…
JonLiu1993 Nov 18, 2020
b2c1db6
[SUNDIALS] Update to 5.5.0
JonLiu1993 Nov 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/sundials/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: sundials
Version: 3.1.1-2
Version: 5.5.0
Homepage: https://computation.llnl.gov/projects/sundials
Description: SUNDIALS (SUite of Nonlinear and DIfferential/ALgebraic equation Solvers)
15 changes: 10 additions & 5 deletions ports/sundials/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,26 @@
set(ARCHIVE_NAME "sundials-3.1.1")
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 3e8fc7183c5503943f1ba00c73b04c1614a48b6e6cb90559ec5481f9acffaa19acd97bd961611b251ebdc032f1a13f0919b0ab0cdfe9d9b4ddc99d40bef5719f
SHA512 e8cba7341f6b8d647151fe5543e62a13adda363d4c96bdaba7a70925b2c58ec4f4f089a0d6c9c5a57c50fb32fa1285bd09b450697056bc3da24cf882c6c7c427
)

vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
PATCHES
uwp-c4703-warning.patch
)

string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SUN_BUILD_STATIC)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SUN_BUILD_SHARED)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS -DEXAMPLES_ENABLE=OFF
OPTIONS
-DEXAMPLES_ENABLE=OFF
-DBUILD_STATIC_LIBS=${SUN_BUILD_STATIC}
-DBUILD_SHARED_LIBS=${SUN_BUILD_SHARED}
)

vcpkg_install_cmake(DISABLE_PARALLEL)
Expand Down Expand Up @@ -53,3 +57,4 @@ if(REMOVE_DLLS)
endif()

vcpkg_copy_pdbs()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
12 changes: 0 additions & 12 deletions ports/sundials/uwp-c4703-warning.patch
View file
Open in desktop

This file was deleted.