Skip to content

Commit 765558d

Browse files
authored
Merge pull request #354 from elbeno/protect-boost-mp11
👷 Protect against boost_mp11 coming from boost
2 parents 603ba35 + c6d99d0 commit 765558d

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

.github/workflows/usage_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
env:
1313
DEBIAN_FRONTEND: noninteractive
1414
CMAKE_GENERATOR: Ninja
15-
USER_CMAKE_VERSION: 3.25
15+
USER_CMAKE_VERSION: 3.27
1616

1717
jobs:
1818
usage_test:

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ else()
1414
cpmaddpackage("gh:intel/cicd-repo-infrastructure#3e2bef0")
1515
endif()
1616

17-
add_versioned_package("gh:boostorg/mp11#boost-1.83.0")
17+
add_versioned_package(URI "gh:boostorg/mp11#boost-1.83.0" TARGET boost_mp11)
1818
fmt_recipe(12.1.0)
1919
add_versioned_package("gh:intel/cpp-baremetal-concurrency#06e5901")
2020

usage_test/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@ if(NOT DEFINED CMAKE_CXX_STANDARD)
1111
endif()
1212

1313
include(${CMAKE_CURRENT_LIST_DIR}/../cmake/get_cpm.cmake)
14-
cpmaddpackage(NAME stdx SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/.." GIT_TAG HEAD)
14+
cpmaddpackage("gh:intel/cicd-repo-infrastructure#dev")
15+
16+
add_versioned_package(NAME stdx SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/.."
17+
GIT_TAG HEAD)
1518

1619
add_executable(app main.cpp)
1720
target_link_libraries(app PRIVATE stdx)

0 commit comments

Comments
 (0)