From c6d99d05d557ad6b0fa7bfd8046c696e64b9bd50 Mon Sep 17 00:00:00 2001 From: Ben Deane Date: Mon, 13 Apr 2026 09:00:51 -0600 Subject: [PATCH] :construction_worker: Protect against boost_mp11 coming from boost Problem: - When `boost` is already fetched as a dependency and the `boost_mp11` target exists, fetching `boost_mp11` fails. Solution: - Allow `boost_mp11` target to exist. --- .github/workflows/usage_test.yml | 2 +- CMakeLists.txt | 2 +- usage_test/CMakeLists.txt | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/usage_test.yml b/.github/workflows/usage_test.yml index cc451c9..a3e7ed8 100644 --- a/.github/workflows/usage_test.yml +++ b/.github/workflows/usage_test.yml @@ -12,7 +12,7 @@ on: env: DEBIAN_FRONTEND: noninteractive CMAKE_GENERATOR: Ninja - USER_CMAKE_VERSION: 3.25 + USER_CMAKE_VERSION: 3.27 jobs: usage_test: diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e46ddd..0c1a03e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ else() cpmaddpackage("gh:intel/cicd-repo-infrastructure#3e2bef0") endif() -add_versioned_package("gh:boostorg/mp11#boost-1.83.0") +add_versioned_package(URI "gh:boostorg/mp11#boost-1.83.0" TARGET boost_mp11) fmt_recipe(12.1.0) add_versioned_package("gh:intel/cpp-baremetal-concurrency#06e5901") diff --git a/usage_test/CMakeLists.txt b/usage_test/CMakeLists.txt index cda38df..df86d7a 100644 --- a/usage_test/CMakeLists.txt +++ b/usage_test/CMakeLists.txt @@ -11,7 +11,10 @@ if(NOT DEFINED CMAKE_CXX_STANDARD) endif() include(${CMAKE_CURRENT_LIST_DIR}/../cmake/get_cpm.cmake) -cpmaddpackage(NAME stdx SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/.." GIT_TAG HEAD) +cpmaddpackage("gh:intel/cicd-repo-infrastructure#dev") + +add_versioned_package(NAME stdx SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/.." + GIT_TAG HEAD) add_executable(app main.cpp) target_link_libraries(app PRIVATE stdx)