diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml index 4aebc2d..09abb60 100644 --- a/.github/workflows/actions_build.yml +++ b/.github/workflows/actions_build.yml @@ -583,7 +583,8 @@ jobs: working-directory: ${{runner.workspace}}/build run: | cmake %GITHUB_WORKSPACE% -A ${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install ^ - -DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install;${{env.QTDIR}}" -DBoost_USE_STATIC_LIBS=ON ^ + -DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install;${{env.QTDIR}}" ^ + -DCMAKE_POLICY_DEFAULT_CMP0167=OLD -DBoost_USE_STATIC_LIBS=ON ^ -DCMAKE_CXX_STANDARD=${{matrix.cpp}} -DUBLOX_TOOLS_QT_VER=${{matrix.qt_ver}} ^ -DUBLOX_GEN_PROTOCOL=ON -DUBLOX_GEN_TEST=ON -DUBLOX_GEN_TOOLS=ON -DUBLOX_BUILD_TOOLS=${{env.BUILD_TOOLS}} ^ -DUBLOX_BUILD_EXAMPLES=ON ^ @@ -617,7 +618,7 @@ jobs: if: matrix.arch == 'x64' shell: cmd run: | - choco install boost-msvc-14.3 + choco install boost-msvc-14.3 --version=1.85.0 - name: Prepare externals shell: cmd @@ -640,7 +641,8 @@ jobs: working-directory: ${{runner.workspace}}/build run: | cmake %GITHUB_WORKSPACE% -A ${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install ^ - -DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install" -DBoost_USE_STATIC_LIBS=ON ^ + -DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install" ^ + -DCMAKE_POLICY_DEFAULT_CMP0167=OLD -DBoost_USE_STATIC_LIBS=ON ^ -DCMAKE_CXX_STANDARD=${{matrix.cpp}} -DUBLOX_TOOLS_QT_VER=${{matrix.qt_ver}} ^ -DUBLOX_GEN_PROTOCOL=ON -DUBLOX_GEN_TEST=ON -DUBLOX_BUILD_EXAMPLES=${{env.HAS_BOOST}} ^ -DUBLOX_SCHEMA_FILES_LIST_FILE=%GITHUB_WORKSPACE%/basic_msgs.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 4039dc4..0a5ed34 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,6 +36,12 @@ option (UBLOX_BUILD_EXAMPLES "Build examples." OFF) set (UBLOX_VERSION "2.8.1") set (UBLOX_MIN_COMMSDSL_VERSION "6.3.4") +if (("${CMAKE_VERSION}" VERSION_GREATER_EQUAL "3.30") AND + (NOT DEFINED CMAKE_POLICY_DEFAULT_CMP0167)) + # Find boost cmake configuration from the boost installation + cmake_policy(SET CMP0167 NEW) +endif () + set (EXTERNALS_DIR "${PROJECT_SOURCE_DIR}/externals") set (PROT_OUTPUT_TGT "prot_output_tgt")