Update vcpkg packages on windows CI

STEllAR-GROUP · Dec 12, 2024 · 4e33db8 · 4e33db8
1 parent d28c1c3
commit 4e33db8
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 16 deletions.
diff --git a/.github/workflows/windows_clang_debug.yml b/.github/workflows/windows_clang_debug.yml
@@ -22,7 +22,7 @@ jobs:
       run: |
         md C:\projects
         $client = new-object System.Net.WebClient
-        $client.DownloadFile("https://rostam.cct.lsu.edu/download/builder/vcpkg-export-hpx-dependencies-2022.7z","C:\projects\vcpkg-export-hpx-dependencies.7z")
+        $client.DownloadFile("https://rostam.cct.lsu.edu/download/builder/vcpkg-export-hpx-dependencies-2024.7z","C:\projects\vcpkg-export-hpx-dependencies.7z")
         7z x C:\projects\vcpkg-export-hpx-dependencies.7z -y -oC:\projects\vcpkg
     - name: Configure
       shell: bash

diff --git a/.github/workflows/windows_clang_release.yml b/.github/workflows/windows_clang_release.yml
@@ -22,7 +22,7 @@ jobs:
       run: |
         md C:\projects
         $client = new-object System.Net.WebClient
-        $client.DownloadFile("https://rostam.cct.lsu.edu/download/builder/vcpkg-export-hpx-dependencies-2022.7z","C:\projects\vcpkg-export-hpx-dependencies.7z")
+        $client.DownloadFile("https://rostam.cct.lsu.edu/download/builder/vcpkg-export-hpx-dependencies-2024.7z","C:\projects\vcpkg-export-hpx-dependencies.7z")
         7z x C:\projects\vcpkg-export-hpx-dependencies.7z -y -oC:\projects\vcpkg
     - name: Configure
       shell: bash

diff --git a/.github/workflows/windows_debug_vs2019.yml b/.github/workflows/windows_debug_vs2019.yml
@@ -22,7 +22,7 @@ jobs:
       run: |
         md C:\projects
         $client = new-object System.Net.WebClient
-        $client.DownloadFile("https://rostam.cct.lsu.edu/download/builder/vcpkg-export-hpx-dependencies-2022.7z","C:\projects\vcpkg-export-hpx-dependencies.7z")
+        $client.DownloadFile("https://rostam.cct.lsu.edu/download/builder/vcpkg-export-hpx-dependencies-2024.7z","C:\projects\vcpkg-export-hpx-dependencies.7z")
         7z x C:\projects\vcpkg-export-hpx-dependencies.7z -y -oC:\projects\vcpkg
     - name: Configure
       shell: bash

diff --git a/.github/workflows/windows_debug_vs2022.yml b/.github/workflows/windows_debug_vs2022.yml
@@ -22,7 +22,7 @@ jobs:
       run: |
         md C:\projects
         $client = new-object System.Net.WebClient
-        $client.DownloadFile("https://rostam.cct.lsu.edu/download/builder/vcpkg-export-hpx-dependencies-2022.7z","C:\projects\vcpkg-export-hpx-dependencies.7z")
+        $client.DownloadFile("https://rostam.cct.lsu.edu/download/builder/vcpkg-export-hpx-dependencies-2024.7z","C:\projects\vcpkg-export-hpx-dependencies.7z")
         7z x C:\projects\vcpkg-export-hpx-dependencies.7z -y -oC:\projects\vcpkg
     - name: Configure
       shell: bash

diff --git a/.github/workflows/windows_debug_vs2022_fetch_boost.yml b/.github/workflows/windows_debug_vs2022_fetch_boost.yml
@@ -11,7 +11,7 @@ on: [pull_request]
 jobs:
   build:
     runs-on: windows-latest
-    
+
     steps:
       - uses: actions/checkout@v4
       - uses: jwlawson/[email protected]
@@ -21,7 +21,7 @@ jobs:
         run: |
           md C:\projects
           $client = new-object System.Net.WebClient
-          $client.DownloadFile("https://rostam.cct.lsu.edu/download/builder/vcpkg-export-hpx-dependencies-2022.7z","C:\projects\vcpkg-export-hpx-dependencies.7z")
+          $client.DownloadFile("https://rostam.cct.lsu.edu/download/builder/vcpkg-export-hpx-dependencies-2024.7z","C:\projects\vcpkg-export-hpx-dependencies.7z")
           7z x C:\projects\vcpkg-export-hpx-dependencies.7z -y -oC:\projects\vcpkg
       - name: Configure
         shell: bash

diff --git a/.github/workflows/windows_debug_vs2022_fetch_hwloc.yml b/.github/workflows/windows_debug_vs2022_fetch_hwloc.yml
@@ -22,7 +22,7 @@ jobs:
       run: |
         md C:\projects
         $client = new-object System.Net.WebClient
-        $client.DownloadFile("https://rostam.cct.lsu.edu/download/builder/vcpkg-export-hpx-dependencies-2022.7z","C:\projects\vcpkg-export-hpx-dependencies.7z")
+        $client.DownloadFile("https://rostam.cct.lsu.edu/download/builder/vcpkg-export-hpx-dependencies-2024.7z","C:\projects\vcpkg-export-hpx-dependencies.7z")
         7z x C:\projects\vcpkg-export-hpx-dependencies.7z -y -oC:\projects\vcpkg
     - name: Configure
       shell: bash

diff --git a/.github/workflows/windows_release_2019.yml b/.github/workflows/windows_release_2019.yml
@@ -21,7 +21,7 @@ jobs:
       run: |
         md C:\projects
         $client = new-object System.Net.WebClient
-        $client.DownloadFile("https://rostam.cct.lsu.edu/download/builder/vcpkg-export-hpx-dependencies-2022.7z","C:\projects\vcpkg-export-hpx-dependencies.7z")
+        $client.DownloadFile("https://rostam.cct.lsu.edu/download/builder/vcpkg-export-hpx-dependencies-2024.7z","C:\projects\vcpkg-export-hpx-dependencies.7z")
         7z x C:\projects\vcpkg-export-hpx-dependencies.7z -y -oC:\projects\vcpkg
     - name: Configure
       shell: bash

diff --git a/.github/workflows/windows_release_2022.yml b/.github/workflows/windows_release_2022.yml
@@ -21,7 +21,7 @@ jobs:
       run: |
         md C:\projects
         $client = new-object System.Net.WebClient
-        $client.DownloadFile("https://rostam.cct.lsu.edu/download/builder/vcpkg-export-hpx-dependencies-2022.7z","C:\projects\vcpkg-export-hpx-dependencies.7z")
+        $client.DownloadFile("https://rostam.cct.lsu.edu/download/builder/vcpkg-export-hpx-dependencies-2024.7z","C:\projects\vcpkg-export-hpx-dependencies.7z")
         7z x C:\projects\vcpkg-export-hpx-dependencies.7z -y -oC:\projects\vcpkg
     - name: Configure
       shell: bash

diff --git a/.github/workflows/windows_release_static.yml b/.github/workflows/windows_release_static.yml
@@ -22,7 +22,7 @@ jobs:
       run: |
         md C:\projects
         $client = new-object System.Net.WebClient
-        $client.DownloadFile("https://rostam.cct.lsu.edu/download/builder/vcpkg-export-hpx-dependencies-2022.7z","C:\projects\vcpkg-export-hpx-dependencies.7z")
+        $client.DownloadFile("https://rostam.cct.lsu.edu/download/builder/vcpkg-export-hpx-dependencies-2024.7z","C:\projects\vcpkg-export-hpx-dependencies.7z")
         7z x C:\projects\vcpkg-export-hpx-dependencies.7z -y -oC:\projects\vcpkg
     - name: Configure
       shell: bash

diff --git a/cmake/HPX_SetupBoost.cmake b/cmake/HPX_SetupBoost.cmake
@@ -9,13 +9,12 @@
 
 # In case find_package(HPX) is called multiple times
 if(NOT TARGET hpx_dependencies_boost)
-  # We first try to find the required minimum set of Boost libraries. This will
-  # also give us the version of the found boost installation
   if(HPX_WITH_STATIC_LINKING)
     set(Boost_USE_STATIC_LIBS ON)
   endif()
 
-  # set(__boost_libraries disable_autolinking)
+  set(__boost_libraries "")
+
   if(HPX_PARCELPORT_LIBFABRIC_WITH_LOGGING
      OR HPX_PARCELPORT_LIBFABRIC_WITH_DEV_MODE
   )
@@ -78,11 +77,11 @@ if(NOT TARGET hpx_dependencies_boost)
       Boost
       URL https://github.com/boostorg/boost/releases/download/boost-${HPX_WITH_BOOST_VERSION}/boost-${HPX_WITH_BOOST_VERSION}-cmake.tar.xz
       TLS_VERIFY true
-      DOWNLOAD_EXTRACT_TIMESTAMP true
+      DOWNLOAD_EXTRACT_TIMESTAMP true SYSTEM
     )
 
-    # Need to explicitly list header-only dependencies, since Cmake-Boost has
-    # installs each library's headers individually, as opposed to b2-built
+    # Also need to explicitly list header-only dependencies, since Cmake-Boost
+    # has installs each library's headers individually, as opposed to b2-built
     # Boost.
     set(__boost_libraries
         ${__boost_libraries}