Merge pull request #3663 from andreasschulte/sundials_update_3_1_1

[sundials] update to 3.1.1
This commit is contained in:
Alexander Karatarakis 2018-06-13 12:07:12 -07:00 committed by GitHub
commit f8cca36963
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 3 deletions

View File

@ -1,3 +1,3 @@
Source: sundials
Version: 2.7.0-1
Version: 3.1.1
Description: SUNDIALS (SUite of Nonlinear and DIfferential/ALgebraic equation Solvers)

View File

@ -1,15 +1,21 @@
include(vcpkg_common_functions)
set(ARCHIVE_NAME "sundials-2.7.0")
set(ARCHIVE_NAME "sundials-3.1.1")
set(SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/src/${ARCHIVE_NAME}")
vcpkg_download_distfile(ARCHIVE_FILE
URLS "https://computation.llnl.gov/projects/sundials/download/${ARCHIVE_NAME}.tar.gz"
FILENAME "${ARCHIVE_NAME}.tar.gz"
SHA512 c86c167538065a4109b36ae7c8f60f3d92184133cfa661b5acfccee052c38f40be865412a1746bb57907b61602c212c0f15e1e30ef29e8a49db6d46a75a28e69
SHA512 3e8fc7183c5503943f1ba00c73b04c1614a48b6e6cb90559ec5481f9acffaa19acd97bd961611b251ebdc032f1a13f0919b0ab0cdfe9d9b4ddc99d40bef5719f
)
vcpkg_extract_source_archive(${ARCHIVE_FILE})
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES
${CMAKE_CURRENT_LIST_DIR}/uwp-c4703-warning.patch
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS -DEXAMPLES_ENABLE=OFF
@ -41,6 +47,8 @@ if(DEBUG_DLLS)
endif()
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/sundials RENAME copyright)
file(REMOVE "${CURRENT_PACKAGES_DIR}/LICENSE")
file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/LICENSE")
if(REMOVE_DLLS)
file(REMOVE ${REMOVE_DLLS})

View File

@ -0,0 +1,12 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4030f4d..afef556 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -602,6 +602,7 @@ MARK_AS_ADVANCED(FORCE SUNDIALS_DEVTESTS)
IF(WIN32)
ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
+ ADD_COMPILE_OPTIONS(/wd4703) # Needed for uwp
ENDIF(WIN32)
IF(APPLE)