From 4e33db8459c11e0a2dd50d51d24526511c3e4774 Mon Sep 17 00:00:00 2001 From: Pansysk75 Date: Wed, 2 Oct 2024 09:46:08 -0500 Subject: [PATCH] Update vcpkg packages on windows CI --- .github/workflows/windows_clang_debug.yml | 2 +- .github/workflows/windows_clang_release.yml | 2 +- .github/workflows/windows_debug_vs2019.yml | 2 +- .github/workflows/windows_debug_vs2022.yml | 2 +- .../workflows/windows_debug_vs2022_fetch_boost.yml | 4 ++-- .../workflows/windows_debug_vs2022_fetch_hwloc.yml | 2 +- .github/workflows/windows_release_2019.yml | 2 +- .github/workflows/windows_release_2022.yml | 2 +- .github/workflows/windows_release_static.yml | 2 +- cmake/HPX_SetupBoost.cmake | 11 +++++------ 10 files changed, 15 insertions(+), 16 deletions(-) diff --git a/.github/workflows/windows_clang_debug.yml b/.github/workflows/windows_clang_debug.yml index 2da4c6b4a9e6..9dab2000f4a7 100644 --- 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 index 9d595b1793c5..899d2556364f 100644 --- 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 index 4ef381b46f08..ee56df5e4ae2 100644 --- 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 index 74d23bfc4973..0a0f73ca18cf 100644 --- 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 index d6653a73e0e3..6d6128c6477d 100644 --- 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/actions-setup-cmake@v2.0 @@ -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 index 5054c2468412..d8818e25b897 100644 --- 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 index 25a20d8617be..0f39dbdb7c9e 100644 --- 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 index 0ab767cd09a0..00985b93cef5 100644 --- 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 index e6321d74249c..fad0195e836f 100644 --- 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 index b05f53b27ee1..7f2a124a3fa7 100644 --- 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}