Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ IF (MSGPACK_USE_BOOST)
SET (Boost_USE_STATIC_LIBS FALSE)
ENDIF ()

FIND_PACKAGE (Boost REQUIRED)
FIND_PACKAGE (Boost REQUIRED CONFIG)
ELSE ()
TARGET_COMPILE_DEFINITIONS(msgpack-cxx INTERFACE MSGPACK_NO_BOOST)
ENDIF ()
Expand Down
10 changes: 5 additions & 5 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ version: 7.0.0.{build}

branches:
only:
- cpp_master
- cpp_master

environment:
matrix:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
cpp11: -DMSGPACK_CXX11=ON
msvc: '"Visual Studio 14 2015"'
boost_prefix: C:\Libraries\boost_1_69_0
boost_prefix: C:\Libraries\boost_1_86_0
boost_subdir: lib32-msvc-14.0
build_script:
- ps: |
Expand Down Expand Up @@ -42,7 +42,7 @@ build_script:
-D MSGPACK_BUILD_EXAMPLES=ON `
-D MSGPACK_BUILD_TESTS=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_PREFIX_PATH="C:\Libraries\boost_1_86_0\lib32-msvc-14.0\cmake\Boost-1.86.0;$env:APPVEYOR_BUILD_FOLDER\zlib-1.3.1\prefix" `
-D CMAKE_INSTALL_PREFIX="$env:APPVEYOR_BUILD_FOLDER\prefix" `
-D CMAKE_CXX_FLAGS="/D_VARIADIC_MAX=10 /EHsc /DBOOST_ALL_DYN_LINK" `
..
Expand All @@ -52,5 +52,5 @@ build_script:
if ($LastExitCode -ne 0) { exit $LastExitCode }

test_script:
- set PATH=%PATH%;%APPVEYOR_BUILD_FOLDER%\zlib-1.3.1\build\Release;%APPVEYOR_BUILD_FOLDER%\build\release;%boost_prefix%\%boost_subdir%
- ctest -VV -C Release
- set PATH=%PATH%;%APPVEYOR_BUILD_FOLDER%\zlib-1.3.1\build\Release;%APPVEYOR_BUILD_FOLDER%\build\release;%boost_prefix%\%boost_subdir%
- ctest -VV -C Release
2 changes: 1 addition & 1 deletion example/boost/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FIND_PACKAGE (Boost REQUIRED)
FIND_PACKAGE (Boost REQUIRED CONFIG)
FIND_PACKAGE (Threads REQUIRED)
FIND_PACKAGE (ZLIB REQUIRED)

Expand Down
2 changes: 1 addition & 1 deletion example/cpp03/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FIND_PACKAGE (Threads REQUIRED)

FIND_PACKAGE (Boost COMPONENTS timer)
FIND_PACKAGE (Boost COMPONENTS timer CONFIG)

LIST (APPEND exec_PROGRAMS
class_intrusive.cpp
Expand Down
2 changes: 1 addition & 1 deletion example/x3/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
IF (MSGPACK_USE_X3_PARSE AND MSGPACK_DEFAULT_API_VERSION VERSION_GREATER 1)
FIND_PACKAGE (Boost REQUIRED COMPONENTS context)
FIND_PACKAGE (Boost REQUIRED COMPONENTS context CONFIG)
FIND_PACKAGE (Threads REQUIRED)

LIST (APPEND exec_PROGRAMS
Expand Down
2 changes: 1 addition & 1 deletion fuzz/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FIND_PACKAGE (Threads REQUIRED)
FIND_PACKAGE (Boost REQUIRED COMPONENTS filesystem unit_test_framework)
FIND_PACKAGE (Boost REQUIRED COMPONENTS filesystem unit_test_framework CONFIG)

LIST (APPEND check_PROGRAMS
regression_runner.cpp
Expand Down
2 changes: 1 addition & 1 deletion test-install/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
2 changes: 1 addition & 1 deletion test/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FIND_PACKAGE (Threads REQUIRED)
FIND_PACKAGE (ZLIB)
FIND_PACKAGE (Boost REQUIRED COMPONENTS unit_test_framework)
FIND_PACKAGE (Boost REQUIRED COMPONENTS unit_test_framework CONFIG)

LIST (APPEND check_PROGRAMS
array_ref.cpp
Expand Down
Loading