Skip to content

Commit 596a2fb

Browse files
committed
Another try.
1 parent af68027 commit 596a2fb

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

CMakeLists.txt

Lines changed: 4 additions & 2 deletions
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

@@ -79,7 +81,7 @@ IF (MSGPACK_USE_BOOST)
7981
SET (Boost_USE_STATIC_LIBS FALSE)
8082
ENDIF ()
8183

82-
FIND_PACKAGE (Boost REQUIRED CONFIG)
84+
FIND_PACKAGE (Boost REQUIRED)
8385
ELSE ()
8486
TARGET_COMPILE_DEFINITIONS(msgpack-cxx INTERFACE MSGPACK_NO_BOOST)
8587
ENDIF ()

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ build_script:
6161
$env:cpp11 `
6262
-D MSGPACK_BUILD_EXAMPLES=ON `
6363
-D MSGPACK_BUILD_TESTS=ON `
64-
-D Boost_NO_BOOST_CMAKE=ON `
64+
-D MSGPACK_BOOST_USE_OLD_CMAKE=ON `
6565
-D CMAKE_EXE_LINKER_FLAGS=/LIBPATH:"$env:boost_prefix\$env:boost_subdir" `
6666
-D CMAKE_PREFIX_PATH="$env:boost_prefix;$env:APPVEYOR_BUILD_FOLDER\zlib-1.3.1\prefix" `
6767
-D CMAKE_INSTALL_PREFIX="$env:APPVEYOR_BUILD_FOLDER\prefix" `

0 commit comments

Comments
 (0)