Merge pull request #1301 from LLNL/feature/kweiss/update-vcpkg

Updates vcpkg TPL build on Windows
LLNL · Mar 25, 2024 · 03cbb62 · 03cbb62
2 parents ba885a1 + b2b72b8
commit 03cbb62
Show file tree

Hide file tree

Showing 19 changed files with 53 additions and 386 deletions.
diff --git a/.uberenv_config.json b/.uberenv_config.json
@@ -9,7 +9,7 @@
 "spack_packages_path": ["scripts/spack/radiuss-spack-configs/packages", "scripts/spack/packages"],
 "spack_concretizer": "clingo",
 "vcpkg_url": "https://github.com/microsoft/vcpkg",
-"vcpkg_commit": "c8696863d371ab7f46e213d8f5ca923c4aef2a00",
+"vcpkg_commit": "898b728edc5e0d12b50015f9cd18247c4257a3eb",
 "vcpkg_triplet": "x64-windows",
 "vcpkg_ports_path": "scripts/vcpkg_ports"
 }
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -19,6 +19,13 @@ The Axom project release numbers follow [Semantic Versioning](http://semver.org/
 
 ## [Unreleased] - Release date yyyy-mm-dd
 
+### Changed
+- Upgrades `vcpkg` usage for axom's automated Windows builds to its
+  [2024.03.19 release](https://github.com/microsoft/vcpkg/releases/tag/2024.03.19).
+  Also updates vcpkg port versions for axom dependencies. Temporarily removes `umpire`
+  from axom's default dependencies on Windows due to incompatibility between umpire's
+  external `fmt` and axom's vendored copy.
+
 ## [Version 0.9.0] - Release date 2024-03-19
 
 ### Added

diff --git a/scripts/vcpkg_ports/axom/vcpkg.json b/scripts/vcpkg_ports/axom/vcpkg.json
@@ -9,8 +9,7 @@
     "lua",
     "mfem",
     "openmp",
-    "raja",
-    "umpire"
+    "raja"
   ],
   "features": {
     "conduit": {

diff --git a/scripts/vcpkg_ports/blt/portfile.cmake b/scripts/vcpkg_ports/blt/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO llnl/blt
-    REF v0.5.2
-    SHA512 63e06282483985ae056e4a1557f249a9629130a4f5826c33ef3dbb7b8b1fc1760898fa89abd9734c3ab740aaf253e7284bad6aa342b92286ece810afe62350c2
+    REF v0.6.2
+    SHA512 ca38639dc2bcbd9814e11257ce8d4c8b61e082dcc86ba6ceb339a6e473191b2008158014f06325a1a15b71897d5d42b0f16261dcdd6164081e415b11a06f3ff4
     HEAD_REF develop
 )
 

diff --git a/scripts/vcpkg_ports/blt/vcpkg.json b/scripts/vcpkg_ports/blt/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "blt",
-  "version": "0.5.2",
+  "version": "0.6.2",
   "homepage": "https://github.com/llnl/blt",
   "description": "A streamlined CMake build system foundation for developing HPC software",
   "supports": "!uwp"

diff --git a/scripts/vcpkg_ports/camp/portfile.cmake b/scripts/vcpkg_ports/camp/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO llnl/camp
-    REF v2022.03.2
-    SHA512 d124c0e933f042525e9b48c21b93e7f4f634dfc0f87742e018a1c7de43ed6e30670d8f8e4ce369018a8e1c884b2b27f4755ee9f07a077820b2a3133546f6d622
+    REF v2024.02.0
+    SHA512 91ffb19a09f4df1f5d68acd02d8c63692e4aefdb85229a283c244f6f39b9932c8b56996c2bfa7535d58f9c6e7b325352d4cee3f8e9b2969f0a3a7daad643bf24
     HEAD_REF develop
 )
 
@@ -82,4 +82,9 @@ else()
 endif()
 
 # Put the license file where vcpkg expects it
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/camp RENAME copyright)
+# Note: LICENSE occasionally cannot be found
+if(EXISTS "${SOURCE_PATH}/LICENSE")
+    file(INSTALL     ${SOURCE_PATH}/LICENSE 
+         DESTINATION ${CURRENT_PACKAGES_DIR}/share/camp 
+         RENAME      copyright)
+endif()
diff --git a/scripts/vcpkg_ports/camp/vcpkg.json b/scripts/vcpkg_ports/camp/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "camp",
-  "version-string": "2022.03.2",
+  "version-string": "2024.02.0",
   "homepage": "https://github.com/llnl/camp",
   "description": "Compiler agnostic metaprogramming library",
   "dependencies": [

diff --git a/scripts/vcpkg_ports/conduit/portfile.cmake b/scripts/vcpkg_ports/conduit/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO llnl/conduit
-    REF v0.8.6
-    SHA512 b85c15bfa2687ba47f53c1ca269af72a1a31161848047e653bdc722a07f2682623640758cb5e83565ee655eca7cc993921c656208e6084513843927d76c5db66
+    REF v0.9.1
+    SHA512 fc9449952ea3521e9f76e58f13ccfa2e9a8bdc513f25b675af2d4984dd9ba8e7bed7e1d27e539a69dfda3d4fd48ea6d009ecb2e593d5b059a738da2f9b4310c9
     HEAD_REF develop
     PATCHES 
         "./setup_deps_vcpkg_triplet.patch"

diff --git a/scripts/vcpkg_ports/conduit/vcpkg.json b/scripts/vcpkg_ports/conduit/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "conduit",
-  "version": "0.8.6",
+  "version": "0.9.1",
   "homepage": "https://github.com/llnl/conduit",
   "description": "Simplified Data Exchange for HPC Simulations",
   "dependencies": [

diff --git a/scripts/vcpkg_ports/mfem/export-extern-vars.patch b/scripts/vcpkg_ports/mfem/export-extern-vars.patch