Add MSGPACK_USE_STATIC_BOOST cmake option

CMakeLists.txt

@@ -21,12 +21,14 @@ OPTION (MSGPACK_CXX14 "Using c++14 compiler" OFF)
 OPTION (MSGPACK_CXX17 "Using c++17 compiler" OFF)
 OPTION (MSGPACK_CXX20 "Using c++20 compiler" OFF)
 
-OPTION (MSGPACK_32BIT           "32bit compile"             OFF)
+OPTION (MSGPACK_32BIT            "32bit compile"                        OFF)
-OPTION (MSGPACK_USE_X3_PARSE    "Use Boost X3 parse"        OFF)
+OPTION (MSGPACK_USE_X3_PARSE     "Use Boost X3 parse"                   OFF)
-OPTION (MSGPACK_BUILD_TESTS     "Build tests"               OFF)
+OPTION (MSGPACK_BUILD_TESTS      "Build tests"                          OFF)
-OPTION (MSGPACK_FUZZ_REGRESSION "Enable regression testing" OFF)
+OPTION (MSGPACK_FUZZ_REGRESSION  "Enable regression testing"            OFF)
-OPTION (MSGPACK_BUILD_EXAMPLES  "Build msgpack examples"    OFF)
+OPTION (MSGPACK_BUILD_EXAMPLES   "Build msgpack examples"               OFF)
-OPTION (MSGPACK_GEN_COVERAGE    "Generate coverage report"  OFF)
+OPTION (MSGPACK_GEN_COVERAGE     "Generate coverage report"             OFF)
+OPTION (MSGPACK_USE_STATIC_BOOST "Statically link with boost libraries" OFF)
+OPTION (MSGPACK_CHAR_SIGN        "Char sign to use (signed or unsigned)")
 
 SET (CMAKE_CXX_STANDARD_REQUIRED ON)
 
@@ -59,8 +61,15 @@ IF (MSGPACK_32BIT)
     ENDIF ()
 ENDIF ()
 
-SET (Boost_USE_MULTITHREADED      ON)
+SET (Boost_USE_MULTITHREADED ON)
-SET (Boost_USE_STATIC_RUNTIME    OFF)
+
+IF (MSGPACK_USE_STATIC_BOOST)
+    MESSAGE (STATUS "Staticly linking with Boost")
+    SET (Boost_USE_STATIC_LIBS TRUE)
+ELSE ()
+    MESSAGE (STATUS "Dynamically linking with Boost")
+    SET (Boost_USE_STATIC_LIBS FALSE)
+ENDIF ()
 
 IF (MSGPACK_CHAR_SIGN)
     SET (CMAKE_CXX_FLAGS "-f${MSGPACK_CHAR_SIGN}-char ${CMAKE_CXX_FLAGS}")
@@ -69,6 +78,7 @@ ENDIF ()
 IF (MSGPACK_DEFAULT_API_VERSION)
     SET (CMAKE_CXX_FLAGS "-DMSGPACK_DEFAULT_API_VERSION=${MSGPACK_DEFAULT_API_VERSION} ${CMAKE_CXX_FLAGS}")
 ELSE ()
+    SET (MSGPACK_DEFAULT_API_VERSION 3)
     SET (CMAKE_CXX_FLAGS "-DMSGPACK_DEFAULT_API_VERSION=3 ${CMAKE_CXX_FLAGS}")
 ENDIF ()
 

README.md

@@ -153,6 +153,8 @@ Other useful options:
 - `MSGPACK_32BIT` (default `OFF`): 32bit compile
 - `MSGPACK_USE_X3_PARSE` (default `OFF`): use Boost X3 parse
   (note that it requires C++14 or newer)
+- `MSGPACK_CHAR_SIGN` (not set explicitly by default): char sign to use (signed or unsigned)
+- `MSGPACK_USE_STATIC_BOOST` (default `OFF`): statically link with boost libraries
 
 #### GUI on Windows
 

cmake/CodeCoverage.cmake

@@ -4,52 +4,52 @@ FIND_PROGRAM(LCOV_PATH lcov)
 FIND_PROGRAM(GENHTML_PATH genhtml)
 
 IF(NOT GCOV_PATH)
-	MESSAGE(FATAL_ERROR "gcov not found! Aborting...")
+    MESSAGE(FATAL_ERROR "gcov not found! Aborting...")
 ENDIF()
 
 IF(NOT CMAKE_COMPILER_IS_GNUCC AND NOT CMAKE_COMPILER_IS_GNUCXX)
-	# Clang version 3.0.0 and greater now supports gcov as well.
+    # Clang version 3.0.0 and greater now supports gcov as well.
-	MESSAGE(STATUS "Compiler is not GNU gcc! Clang Version 3.0.0 and greater supports gcov as well, but older versions don't.")
+    MESSAGE(STATUS "Compiler is not GNU gcc! Clang Version 3.0.0 and greater supports gcov as well, but older versions don't.")
-	IF(NOT "${CMAKE_C_COMPILER_ID}" MATCHES "Clang" AND NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+    IF(NOT "${CMAKE_C_COMPILER_ID}" MATCHES "Clang" AND NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-		MESSAGE(FATAL_ERROR "Compiler is not GNU gcc! Aborting...")
+        MESSAGE(FATAL_ERROR "Compiler is not GNU gcc! Aborting...")
-	ENDIF()
+    ENDIF()
 ENDIF()
 
 SET(COVERAGE_FLAGS "-g -O0 --coverage")
 
 FUNCTION(SETUP_TARGET_FOR_COVERAGE _targetname _testrunner _outputname)
 
-	IF(NOT LCOV_PATH)
+    IF(NOT LCOV_PATH)
-		MESSAGE(FATAL_ERROR "lcov not found! Aborting...")
+        MESSAGE(FATAL_ERROR "lcov not found! Aborting...")
-	ENDIF()
+    ENDIF()
 
-	IF(NOT GENHTML_PATH)
+    IF(NOT GENHTML_PATH)
-		MESSAGE(FATAL_ERROR "genhtml not found! Aborting...")
+        MESSAGE(FATAL_ERROR "genhtml not found! Aborting...")
-	ENDIF()
+    ENDIF()
 
-	# Setup target
+    # Setup target
-	ADD_CUSTOM_TARGET(${_targetname}
+    ADD_CUSTOM_TARGET(${_targetname}
 
-		# Cleanup lcov
+        # Cleanup lcov
-		${LCOV_PATH} --directory . --zerocounters
+        ${LCOV_PATH} --directory . --zerocounters
 
-		# Run tests
+        # Run tests
-		COMMAND ${_testrunner} ${ARGV3}
+        COMMAND ${_testrunner} ${ARGV3}
 
-		# Capturing lcov counters and generating report
+        # Capturing lcov counters and generating report
-		COMMAND ${LCOV_PATH} --directory . --capture --output-file ${_outputname}.info --base-directory ${CMAKE_SOURCE_DIR} --no-external --quiet
+        COMMAND ${LCOV_PATH} --directory . --capture --output-file ${_outputname}.info --base-directory ${CMAKE_SOURCE_DIR} --no-external --quiet
-		COMMAND ${LCOV_PATH} --remove ${_outputname}.info '*/test/*' '*/fuzz/*' --output-file ${_outputname}.info.cleaned --quiet
+        COMMAND ${LCOV_PATH} --remove ${_outputname}.info '*/test/*' '*/fuzz/*' --output-file ${_outputname}.info.cleaned --quiet
-		COMMAND ${GENHTML_PATH} -o ${_outputname} ${_outputname}.info.cleaned --prefix ${CMAKE_SOURCE_DIR}
+        COMMAND ${GENHTML_PATH} -o ${_outputname} ${_outputname}.info.cleaned --prefix ${CMAKE_SOURCE_DIR}
-		# COMMAND ${CMAKE_COMMAND} -E remove ${_outputname}.info ${_outputname}.info.cleaned
+        # COMMAND ${CMAKE_COMMAND} -E remove ${_outputname}.info ${_outputname}.info.cleaned
 
-		WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-		COMMENT "Resetting code coverage counters to zero.\nProcessing code coverage counters and generating report."
+        COMMENT "Resetting code coverage counters to zero.\nProcessing code coverage counters and generating report."
-	)
+    )
 
-	# Show info where to find the report
+    # Show info where to find the report
-	ADD_CUSTOM_COMMAND(TARGET ${_targetname} POST_BUILD
+    ADD_CUSTOM_COMMAND(TARGET ${_targetname} POST_BUILD
-		COMMAND ;
+        COMMAND ;
-		COMMENT "Open ./${_outputname}/index.html in your browser to view the coverage report."
+        COMMENT "Open ./${_outputname}/index.html in your browser to view the coverage report."
-	)
+    )
 
 ENDFUNCTION()

example/x3/CMakeLists.txt

@@ -1,5 +1,5 @@
 IF (MSGPACK_USE_X3_PARSE AND MSGPACK_DEFAULT_API_VERSION VERSION_GREATER 1)
-    FIND_PACKAGE (Boost REQUIRED COMPONENTS context system unit_test_framework)
+    FIND_PACKAGE (Boost REQUIRED COMPONENTS context system)
     FIND_PACKAGE (Threads REQUIRED)
 
     LIST (APPEND exec_PROGRAMS
@@ -43,7 +43,6 @@ IF (MSGPACK_USE_X3_PARSE AND MSGPACK_DEFAULT_API_VERSION VERSION_GREATER 1)
             msgpackc-cxx
             Boost::context
             Boost::system
-            Boost::unit_test_framework
             Threads::Threads
         )
         IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")

fuzz/CMakeLists.txt

@@ -11,6 +11,10 @@ FOREACH (source_file ${check_PROGRAMS})
         ${source_file_we}
         ${source_file}
     )
+
+    TARGET_COMPILE_DEFINITIONS (${source_file_we} PRIVATE
+        $<IF:$<BOOL:${MSGPACK_USE_STATIC_BOOST}>,,BOOST_TEST_DYN_LINK>)
+
     TARGET_LINK_LIBRARIES (${source_file_we}
         msgpackc-cxx
         Threads::Threads
@@ -18,7 +22,9 @@ FOREACH (source_file ${check_PROGRAMS})
         Boost::system
         Boost::unit_test_framework
     )
+
     ADD_TEST (${source_file_we} ${source_file_we})
+
     IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
       SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Wno-mismatched-tags -g")
         IF ("${MSGPACK_SAN}" STREQUAL "ASAN")

test/CMakeLists.txt

@@ -74,6 +74,9 @@ FOREACH (source_file ${check_PROGRAMS})
         ${source_file}
     )
 
+    TARGET_COMPILE_DEFINITIONS (${source_file_we} PRIVATE
+        $<IF:$<BOOL:${MSGPACK_USE_STATIC_BOOST}>,,BOOST_TEST_DYN_LINK>)
+
     TARGET_LINK_LIBRARIES (${source_file_we}
         msgpackc-cxx
         Boost::system
@@ -81,6 +84,7 @@ FOREACH (source_file ${check_PROGRAMS})
         Threads::Threads
         ZLIB::ZLIB
     )
+
     ADD_TEST (NAME ${source_file_we} COMMAND ${source_file_we})
 
     IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")