From 74de60b2dbd974972b460820db44f3f859996cc2 Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Fri, 28 May 2021 12:18:59 -0700 Subject: [PATCH 1/2] [sundials] fix cmake targets to link bin/*.dll --- ports/sundials/install-dlls-in-bin.patch | 11 ++++++++++ ports/sundials/portfile.cmake | 27 ++---------------------- 2 files changed, 13 insertions(+), 25 deletions(-) create mode 100644 ports/sundials/install-dlls-in-bin.patch diff --git a/ports/sundials/install-dlls-in-bin.patch b/ports/sundials/install-dlls-in-bin.patch new file mode 100644 index 00000000000000..2a4ab5a49ccc90 --- /dev/null +++ b/ports/sundials/install-dlls-in-bin.patch @@ -0,0 +1,11 @@ +--- a/cmake/macros/SundialsAddLibrary.cmake ++++ b/cmake/macros/SundialsAddLibrary.cmake +@@ -323,7 +323,7 @@ + set_target_properties(${_actual_target_name} PROPERTIES ${_properties}) + endif() + + # install phase +- install(TARGETS ${_actual_target_name} DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT sundials-targets) ++ install(TARGETS ${_actual_target_name} EXPORT sundials-targets) + + endif() diff --git a/ports/sundials/portfile.cmake b/ports/sundials/portfile.cmake index 3af735a682fe64..ae72b89a24cc67 100644 --- a/ports/sundials/portfile.cmake +++ b/ports/sundials/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF 73c280cd55ca2b42019c8a9aa54af10e41e27b9d # v5.7.0 SHA512 c70c53e5f5efe47255d23f36e71ffd75d61905a13a634a26bfbbd43c3c8764b7805db9a8cbe48c6cf69b2a1028701cb7118074bbbc01de71faf4f30bf0be22f9 HEAD_REF master + PATCHES + install-dlls-in-bin.patch ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SUN_BUILD_STATIC) @@ -22,34 +24,9 @@ vcpkg_install_cmake(DISABLE_PARALLEL) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(GLOB REMOVE_DLLS - "${CURRENT_PACKAGES_DIR}/debug/lib/*.dll" - "${CURRENT_PACKAGES_DIR}/lib/*.dll" -) - -file(GLOB DEBUG_DLLS - "${CURRENT_PACKAGES_DIR}/debug/lib/*.dll" -) - -file(GLOB DLLS - "${CURRENT_PACKAGES_DIR}/lib/*.dll" -) - -if(DLLS) - file(INSTALL ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) -endif() - -if(DEBUG_DLLS) - file(INSTALL ${DEBUG_DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) -endif() - file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(REMOVE "${CURRENT_PACKAGES_DIR}/LICENSE") file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/LICENSE") -if(REMOVE_DLLS) - file(REMOVE ${REMOVE_DLLS}) -endif() - vcpkg_copy_pdbs() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) From a406e162c795ca3bde77d711fbf74173fd11d658 Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Fri, 28 May 2021 13:23:35 -0700 Subject: [PATCH 2/2] version --- ports/sundials/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/s-/sundials.json | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ports/sundials/vcpkg.json b/ports/sundials/vcpkg.json index 5985a611588bb1..9245e80d2228ce 100644 --- a/ports/sundials/vcpkg.json +++ b/ports/sundials/vcpkg.json @@ -1,6 +1,7 @@ { "name": "sundials", "version-semver": "5.7.0", + "port-version": 1, "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 8ab78f030b4adb..31ce77c50b642f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5898,7 +5898,7 @@ }, "sundials": { "baseline": "5.7.0", - "port-version": 0 + "port-version": 1 }, "superlu": { "baseline": "2020-01-07", diff --git a/versions/s-/sundials.json b/versions/s-/sundials.json index 98f64958bf3cea..2a5f79d5ffc922 100644 --- a/versions/s-/sundials.json +++ b/versions/s-/sundials.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5acf78bcee903986a02aef256e969f1f7f7a87fa", + "version-semver": "5.7.0", + "port-version": 1 + }, { "git-tree": "f6b0c03d6b78a5632db68b010ab4d9526c73450c", "version-semver": "5.7.0",