Skip to content

Commit 9e331c6

Browse files
committed
Supporting CMP0167 policy.
1 parent e5dd2cd commit 9e331c6

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

.github/workflows/actions_build.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,8 @@ jobs:
448448
working-directory: ${{runner.workspace}}/build
449449
run: |
450450
cmake %GITHUB_WORKSPACE% -A ${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install ^
451-
-DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install;${{env.QTDIR}}" -DBoost_USE_STATIC_LIBS=ON ^
451+
-DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install;${{env.QTDIR}}" ^
452+
-DCMAKE_POLICY_DEFAULT_CMP0167=OLD -DBoost_USE_STATIC_LIBS=ON ^
452453
-DCMAKE_CXX_STANDARD=${{matrix.cpp}} -DDEMO1_TOOLS_QT_VER=${{matrix.qt_ver}} ^
453454
-DDEMO1_GEN_PROTOCOL=ON -DDEMO1_GEN_TEST=ON -DDEMO1_GEN_TOOLS=ON -DDEMO1_BUILD_TOOLS=${{env.BUILD_TOOLS}}
454455
env:
@@ -480,7 +481,7 @@ jobs:
480481
if: matrix.arch == 'x64'
481482
shell: cmd
482483
run: |
483-
choco install boost-msvc-14.3
484+
choco install boost-msvc-14.3 --version=1.85.0
484485
485486
- name: Prepare externals
486487
shell: cmd
@@ -503,7 +504,8 @@ jobs:
503504
working-directory: ${{runner.workspace}}/build
504505
run: |
505506
cmake %GITHUB_WORKSPACE% -A ${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install ^
506-
-DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install" -DBoost_USE_STATIC_LIBS=ON ^
507+
-DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install" ^
508+
-DCMAKE_POLICY_DEFAULT_CMP0167=OLD -DBoost_USE_STATIC_LIBS=ON ^
507509
-DCMAKE_CXX_STANDARD=${{matrix.cpp}} -DDEMO1_TOOLS_QT_VER=${{matrix.qt_ver}} ^
508510
-DDEMO1_GEN_PROTOCOL=ON -DDEMO1_GEN_TEST=ON -DDEMO1_BUILD_EXAMPLES=${{env.HAS_BOOST}}
509511
env:

CMakeLists.txt

+6
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@ option (DEMO1_BUILD_EXAMPLES "Build examples." ON)
3636
set (DEMO1_VERSION "2.8.1")
3737
set (DEMO1_MIN_COMMSDSL_VERSION "6.3.4")
3838

39+
if (("${CMAKE_VERSION}" VERSION_GREATER_EQUAL "3.30") AND
40+
(NOT DEFINED CMAKE_POLICY_DEFAULT_CMP0167))
41+
# Find boost cmake configuration from the boost installation
42+
cmake_policy(SET CMP0167 NEW)
43+
endif ()
44+
3945
set (EXTERNALS_DIR "${PROJECT_SOURCE_DIR}/externals")
4046

4147
set (PROT_OUTPUT_TGT "prot_output_tgt")

0 commit comments

Comments
 (0)