Skip to content

Commit 092bc69

Browse files
authored
Merge pull request #1172 from redboltz/support_old_find_boost
Add old style find boost applying option to cmake.
2 parents a0b2ec0 + 12dd726 commit 092bc69

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,9 @@ ENDIF ()
6767
IF (MSGPACK_USE_BOOST)
6868
IF ((CMAKE_VERSION VERSION_GREATER 3.30) OR
6969
(CMAKE_VERSION VERSION_EQUAL 3.30))
70-
CMAKE_POLICY(SET CMP0167 NEW)
70+
IF (NOT MSGPACK_BOOST_USE_OLD_CMAKE)
71+
CMAKE_POLICY(SET CMP0167 NEW)
72+
ENDIF ()
7173
ENDIF ()
7274
SET (Boost_USE_MULTITHREADED ON)
7375

appveyor.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ build_script:
4141
$env:cpp11 `
4242
-D MSGPACK_BUILD_EXAMPLES=ON `
4343
-D MSGPACK_BUILD_TESTS=ON `
44+
-D MSGPACK_BOOST_USE_OLD_CMAKE=ON `
4445
-D CMAKE_EXE_LINKER_FLAGS=/LIBPATH:"$env:boost_prefix\$env:boost_subdir" `
4546
-D CMAKE_PREFIX_PATH="$env:boost_prefix;$env:APPVEYOR_BUILD_FOLDER\zlib-1.3.1\prefix" `
4647
-D CMAKE_INSTALL_PREFIX="$env:APPVEYOR_BUILD_FOLDER\prefix" `

test-install/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
1+
cmake_minimum_required(VERSION 3.5...4.0)
22

33
project(test-install LANGUAGES CXX)
44

0 commit comments

Comments
 (0)