From 12dd72645a4be96f1feb422ce41f2cd14c72ced3 Mon Sep 17 00:00:00 2001 From: Takatoshi Kondo Date: Mon, 12 Jan 2026 13:45:19 +0900 Subject: [PATCH] Add old style find boost applying option to cmake. When cmake has -D MSGPACK_BOOST_USE_OLD_CMAKE=ON option, cmake use old style find boost. --- CMakeLists.txt | 4 +++- appveyor.yml | 1 + test-install/CMakeLists.txt | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f9a733c1b..8f6d54ca5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,7 +67,9 @@ ENDIF () IF (MSGPACK_USE_BOOST) IF ((CMAKE_VERSION VERSION_GREATER 3.30) OR (CMAKE_VERSION VERSION_EQUAL 3.30)) - CMAKE_POLICY(SET CMP0167 NEW) + IF (NOT MSGPACK_BOOST_USE_OLD_CMAKE) + CMAKE_POLICY(SET CMP0167 NEW) + ENDIF () ENDIF () SET (Boost_USE_MULTITHREADED ON) diff --git a/appveyor.yml b/appveyor.yml index 3385097ad..c0ec57bc8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -41,6 +41,7 @@ build_script: $env:cpp11 ` -D MSGPACK_BUILD_EXAMPLES=ON ` -D MSGPACK_BUILD_TESTS=ON ` + -D MSGPACK_BOOST_USE_OLD_CMAKE=ON ` -D CMAKE_EXE_LINKER_FLAGS=/LIBPATH:"$env:boost_prefix\$env:boost_subdir" ` -D CMAKE_PREFIX_PATH="$env:boost_prefix;$env:APPVEYOR_BUILD_FOLDER\zlib-1.3.1\prefix" ` -D CMAKE_INSTALL_PREFIX="$env:APPVEYOR_BUILD_FOLDER\prefix" ` diff --git a/test-install/CMakeLists.txt b/test-install/CMakeLists.txt index 874198b61..16ff9d38f 100644 --- a/test-install/CMakeLists.txt +++ b/test-install/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1 FATAL_ERROR) +cmake_minimum_required(VERSION 3.5...4.0) project(test-install LANGUAGES CXX)