From 05b075d724438210fd26f979dba46994078b54ff Mon Sep 17 00:00:00 2001 From: Alise Au <20424172+ahiuchingau@users.noreply.github.com> Date: Wed, 10 Jan 2024 10:26:57 -0500 Subject: [PATCH] chore(cmake): fix boost url (#741) * Squashed 'cmake/' changes from 1947be18..574b7acf 574b7acf Merge pull request #33 from Opentrons/fix_boost-url c300243b use archive 69b8b5da feat: add cmake-codecov module subtree (#30) a8d87b7b Merge pull request #29 from Opentrons/multi-arch-compatability-RQA-335 791440d4 chore: Install aarch64 version of Clang when on ARM processor 04673722 fix: ensure FindPoetry module uses pyenv python on mac (#28) c74bda66 Merge pull request #27 from Opentrons/add-message-in-find-poetry 2d00d7c5 Add message stating where poetry executable is 75373dee Merge pull request #26 from Opentrons/change_poetry_script_dir 81f38ecd Fix some stuff 960bfeb0 Merge pull request #25 from Opentrons/change_poetry_script_dir 3566e307 Add find_program to make poetry executable 4abafafc Add output var 05bbeaa2 Add version selection and set env vars c2a97ee7 Fix download dir 43cb0a6f Put poetry install script in stm32-tools f43b4c2c Merge pull request #24 from Opentrons/find_poetry e43541b5 PR Fixes 4da39ab1 feat: FindPoetry.cmake c17c7d7d feat: updated FindSTM32F303BSP.cmake to accommodate multiple targets (#23) 826ca79f Added a cmake file to fetch the Mpaland Printf library (printf without malloc) (#22) 088687d5 upgrade Cmake Catch2 to 2.13.8 (#21) 8bcd4c44 feat:Add STM32G4 USB support (#20) 555cbde3 refactor(cross toolchain): add separate tool chains for arm M4 and M33 (#19) 4d151a4a fix(bsp): use the correct path to port for FreeRTOS in the L5 BSP (#17) e36f4704 feat(cmake-utils): Add L5 source (#16) 7d7f852f chore(cmake): Update changes for FreeRTOS (#15) 521a6c43 Merge pull request #14 from Opentrons/linux-symlink 8b92a64e fix: Specify the correct executable instead of creating a symling e6ae846d fix: Add creation of symlink to clang executable on Ubuntu 5db868a8 chore: merge changes from ot3-firmware (#12) 8a05ce8c chore(FindClang): Use clang 12 (#10) b08f4b58 chore: Add FindFakeIt.cmake (#11) d59934cf chore: add FindFreeRTOS.cmake 7846c04e chore: add FindFreeRTOS.cmake 8a087780 Merge pull request #8 from Opentrons/pull_svd_for_all_st_boards 7ec0fae4 Use commit hash instead a640f8a2 fix(cmake): update the source for svd files to include support for G4 boards ff830728 fix(BSPs): reverse driver compilation (#6) b60e0895 Merge pull request #5 from Opentrons/fix_bsp_package_version 8a8d6f5d fix(g4_bsp): use the correct version when grabbing the bsp for the g4 board 0b30b6f5 feat(boost): add FindBoost (#4) a624372a fix(FindClang): always use downloaded clang-format (#3) 4796fa5a fix(FindClang): fix old osx builtin versioning (#2) df9f86b8 Merge pull request #1 from Opentrons/add_G4_support 97759401 Rename BSP files and names 0fd49b50 feat(cmake-utils): add support to find STM32G4 BSP faa02702 chore: add readme git-subtree-dir: cmake git-subtree-split: 574b7acffa5139dcf2fa1ea5a3d5c5297e018d08 --- cmake/FindBoost.cmake | 2 +- cmake/boost-cmake/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/FindBoost.cmake b/cmake/FindBoost.cmake index 4105d8af0..56ddc5d44 100644 --- a/cmake/FindBoost.cmake +++ b/cmake/FindBoost.cmake @@ -55,7 +55,7 @@ Cache Variables include(FetchContent) string(REPLACE "." "_" "_boost_archive_version_component" "${Boost_FIND_VERSION}") set(boost_localinstall_root ${CMAKE_SOURCE_DIR}/stm32-tools/boost-${_boost_archive_version_component}) -set(boost_archive_root "https://boostorg.jfrog.io/artifactory/main/release") +set(boost_archive_root "https://archives.boost.io/release") set(boost_archive_url "${boost_archive_root}/${Boost_FIND_VERSION}/source/boost_${_boost_archive_version_component}.zip") FetchContent_Declare(Boost PREFIX "${boost_localinstall_root}" diff --git a/cmake/boost-cmake/CMakeLists.txt b/cmake/boost-cmake/CMakeLists.txt index 16d48dc87..a03c93b6a 100644 --- a/cmake/boost-cmake/CMakeLists.txt +++ b/cmake/boost-cmake/CMakeLists.txt @@ -3,7 +3,7 @@ project(Boost-CMake) option(BOOST_DISABLE_TESTS "Do not build test targets, even if building standalone" OFF) -set(BOOST_URL "https://boostorg.jfrog.io/artifactory/main/release/1.71.0/source/boost_1_71_0.tar.bz2" CACHE STRING "Boost download URL") +set(BOOST_URL "https://archives.boost.io/release/1.71.0/source/boost_1_71_0.tar.bz2" CACHE STRING "Boost download URL") set(BOOST_URL_SHA256 "d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee" CACHE STRING "Boost download URL SHA256 checksum") include(FetchContent)