From 8fe87846f3fb221e1247c8eaaacc534eb2e8e847 Mon Sep 17 00:00:00 2001 From: Ben Deane Date: Mon, 13 Apr 2026 09:04:17 -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 | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/usage_test.yml b/.github/workflows/usage_test.yml index 3ba47b5..3917d6b 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 c787716..8cc7be8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,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) add_versioned_package("gh:intel/cpp-baremetal-concurrency#536bdd7") add_versioned_package("gh:intel/cpp-std-extensions#279e430") add_versioned_package("gh:intel/cpp-baremetal-senders-and-receivers#cff72f6") diff --git a/usage_test/CMakeLists.txt b/usage_test/CMakeLists.txt index 28a51b8..f695ce0 100644 --- a/usage_test/CMakeLists.txt +++ b/usage_test/CMakeLists.txt @@ -7,8 +7,10 @@ message(STATUS "Actual cmake version: ${CMAKE_VERSION}") project(groov_usage) include(${CMAKE_CURRENT_LIST_DIR}/../cmake/get_cpm.cmake) -cpmaddpackage(NAME generic-register-operation-optimizer SOURCE_DIR - "${CMAKE_CURRENT_LIST_DIR}/.." GIT_TAG HEAD) +cpmaddpackage("gh:intel/cicd-repo-infrastructure#dev") + +add_versioned_package(NAME generic-register-operation-optimizer SOURCE_DIR + "${CMAKE_CURRENT_LIST_DIR}/.." GIT_TAG HEAD) add_executable(app main.cpp) target_link_libraries(app PRIVATE groov)