From cf4a688e4439e522c79feb6294f8b938a8cbc572 Mon Sep 17 00:00:00 2001 From: Andreas Schulte Date: Tue, 5 Jun 2018 21:06:29 +0200 Subject: [PATCH 1/2] Update sundials to 3.1.1 --- ports/sundials/CONTROL | 2 +- ports/sundials/portfile.cmake | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ports/sundials/CONTROL b/ports/sundials/CONTROL index 376a430fc..7651993bf 100644 --- a/ports/sundials/CONTROL +++ b/ports/sundials/CONTROL @@ -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) diff --git a/ports/sundials/portfile.cmake b/ports/sundials/portfile.cmake index 141cb3b11..52c7ca4a1 100644 --- a/ports/sundials/portfile.cmake +++ b/ports/sundials/portfile.cmake @@ -1,12 +1,12 @@ 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}) @@ -41,6 +41,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}) From 7d899bb45333006463bfd9512507131e81e2ec18 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Tue, 12 Jun 2018 22:15:10 -0700 Subject: [PATCH 2/2] [sundials] Add patch for uwp --- ports/sundials/portfile.cmake | 6 ++++++ ports/sundials/uwp-c4703-warning.patch | 12 ++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 ports/sundials/uwp-c4703-warning.patch diff --git a/ports/sundials/portfile.cmake b/ports/sundials/portfile.cmake index 52c7ca4a1..6798f0272 100644 --- a/ports/sundials/portfile.cmake +++ b/ports/sundials/portfile.cmake @@ -10,6 +10,12 @@ vcpkg_download_distfile(ARCHIVE_FILE ) 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 diff --git a/ports/sundials/uwp-c4703-warning.patch b/ports/sundials/uwp-c4703-warning.patch new file mode 100644 index 000000000..3718753cf --- /dev/null +++ b/ports/sundials/uwp-c4703-warning.patch @@ -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)