Merge pull request #595 from redboltz/ver_2.1.2

Updated the version to 2.1.2.
2025-10-22 08:02:08 +02:00 · 2017-06-07 13:23:23 +09:00 · 2017-06-06 12:26:09 +09:00 · 2017-05-29 00:53:19 +09:00 · 2017-05-22 21:57:21 -07:00 · 2017-05-18 20:25:14 +09:00
28 changed files with 1341 additions and 143 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ install:
 - if [ "$TRAVIS_OS_NAME" == "linux" ]; then export PATH="${BASE}/usr/bin:$PATH"; fi
 - if [ "$TRAVIS_OS_NAME" == "linux" ]; then export LD_LIBRARY_PATH="${BASE}/usr/lib:$LD_LIBRARY_PATH"; fi
 - if [ "$CXX" = "g++" ]; then export CXX="g++-6" CC="gcc-6"; fi
- - if [ "$CXX" = "clang++" ] && [ "$TRAVIS_OS_NAME" == "linux" ]; then export CXX="clang++-3.7" CC="clang-3.7"; fi
+ - if [ "$CXX" = "clang++" ] && [ "$TRAVIS_OS_NAME" == "linux" ]; then export CXX="clang++-3.9" CC="clang-3.9"; fi
 #gtest
 - wget https://github.com/google/googletest/archive/release-1.7.0.zip -O googletest-release-1.7.0.zip
 - unzip -q googletest-release-1.7.0.zip
@@ -27,7 +27,7 @@ install:
 # valgrind
 - if [ "$TRAVIS_OS_NAME" == "linux" ]; then wget http://valgrind.org/downloads/valgrind-3.12.0.tar.bz2 && tar xjf valgrind-3.12.0.tar.bz2 && cd valgrind-3.12.0 && ./configure --prefix=${BASE}/usr > /dev/null && make -j3 > /dev/null && make install > /dev/null && cd ..; fi
 # boost
- - if [ "$BOOST" == "ON" ]; then wget http://sourceforge.net/projects/boost/files/boost/1.63.0/boost_1_63_0.zip && unzip -q boost_1_63_0.zip && cd boost_1_63_0 && ./bootstrap.sh && ./b2 -j3 --prefix=${BASE}/usr --with-timer --with-chrono address-model=${ARCH} install > /dev/null && cd ..; fi
+ - if [ "$BOOST" == "ON" ]; then wget http://sourceforge.net/projects/boost/files/boost/1.63.0/boost_1_63_0.zip && unzip -q boost_1_63_0.zip && cd boost_1_63_0 && ./bootstrap.sh && ./b2 -j3 --prefix=${BASE}/usr --with-chrono --with-context --with-system --with-timer address-model=${ARCH} install > /dev/null && cd ..; fi

 matrix:
  include:
@@ -36,7 +36,7 @@ matrix:
      env: ACTION="ci/build_cmake.sh"  CXX11="ON" ARCH="64"   BOOST="ON" SHARED="ON"  CHAR_SIGN="unsigned" API_VERSION="1"
    - os: osx
      compiler: clang
-      env:  ACTION="ci/build_cmake.sh" CXX11="ON" ARCH="64"   BOOST="ON" SHARED="ON"  CHAR_SIGN="signed"   API_VERSION="2" X3_PARSE="ON"
+      env:  ACTION="ci/build_cmake.sh" CXX11="ON" ARCH="64"   BOOST="ON" SHARED="ON"  CHAR_SIGN="signed"   API_VERSION="2"
    - os: osx
      compiler: clang
      env: ACTION="ci/build_cmake.sh"  CXX11="ON" ARCH="64"              SHARED="ON"  CHAR_SIGN="signed"   API_VERSION="2"
@@ -50,7 +50,7 @@ matrix:
        apt:
          sources:
            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.7
+            - llvm-toolchain-precise-3.9
            - llvm-toolchain-precise
          packages:
            - g++-multilib
@@ -58,7 +58,7 @@ matrix:
            - gcc-5-multilib
            - g++-5-multilib
            - bzip2
-            - clang-3.7
+            - clang-3.9
            - libc6-dbg
    - os: linux
      compiler: clang
@@ -67,7 +67,7 @@ matrix:
        apt:
          sources:
            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.7
+            - llvm-toolchain-precise-3.9
            - llvm-toolchain-precise
          packages:
            - g++-multilib
@@ -79,7 +79,7 @@ matrix:
            - libc6-i386
            - lib32z1-dev
            - bzip2
-            - clang-3.7
+            - clang-3.9
            - libc6-dbg
    - os: linux
      compiler: clang
@@ -88,7 +88,7 @@ matrix:
        apt:
          sources:
            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.7
+            - llvm-toolchain-precise-3.9
            - llvm-toolchain-precise
          packages:
            - g++-multilib
@@ -96,7 +96,7 @@ matrix:
            - gcc-5-multilib
            - g++-5-multilib
            - bzip2
-            - clang-3.7
+            - clang-3.9
            - libc6-dbg
    - os: linux
      compiler: clang
@@ -105,7 +105,7 @@ matrix:
        apt:
          sources:
            - ubuntu-toolchain-r-test
-            - llvm-toolchain-precise-3.7
+            - llvm-toolchain-precise-3.9
            - llvm-toolchain-precise
          packages:
            - g++-multilib
@@ -117,7 +117,7 @@ matrix:
            - libc6-i386
            - lib32z1-dev
            - bzip2
-            - clang-3.7
+            - clang-3.9
            - libc6-dbg
    - os: linux
      compiler: gcc
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+# 2017-06-07 version 2.1.2
+
+* Improve documents (#565)
+  * Fix empty map parse bug (#568)
+  * Improve build system (#569, #570, #572, #579, #591, #592)
+  * Remove some warnings (#574, #578, #586, #588)
+  * Improve cross platform configuration (#577, #582)
+  * Add cmake package config support (#580)
+  * Fix streaming unpack bug (#585)
+
 # 2017-02-04 version 2.1.1

  * Fix unpacker's buffer management bug (#561)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED (VERSION 2.8.6)
+CMAKE_MINIMUM_REQUIRED (VERSION 2.8.12)

 IF ((CMAKE_VERSION VERSION_GREATER 3.1) OR
    (CMAKE_VERSION VERSION_EQUAL 3.1))
@@ -92,21 +92,20 @@ OPTION (MSGPACK_BUILD_EXAMPLES "Build msgpack examples." ON)

 IF (MSGPACK_BOOST)
   SET (CMAKE_CXX_FLAGS "-DMSGPACK_USE_BOOST ${CMAKE_CXX_FLAGS}")
-ENDIF ()
-
-SET (Boost_USE_STATIC_LIBS        ON) # only find static libs
-SET (Boost_USE_MULTITHREADED      ON)
-SET (Boost_USE_STATIC_RUNTIME    OFF)
-FIND_PACKAGE (Boost COMPONENTS chrono context timer system)
-IF (Boost_INCLUDE_DIRS)
-    INCLUDE_DIRECTORIES (
-        ${Boost_INCLUDE_DIRS}
-    )
-ENDIF ()
-IF (MSGPACK_BOOST_DIR)
-    INCLUDE_DIRECTORIES (
-        ${MSGPACK_BOOST_DIR}
-    )
+   SET (Boost_USE_MULTITHREADED      ON)
+   SET (Boost_USE_STATIC_RUNTIME    OFF)
+   FIND_PACKAGE (Boost REQUIRED COMPONENTS chrono context system timer)
+   INCLUDE_DIRECTORIES (
+      ${Boost_INCLUDE_DIRS}
+   )
+   LINK_DIRECTORIES (
+      ${Boost_LIBRARY_DIRS}
+   )
+   IF (MSGPACK_BOOST_DIR)
+      INCLUDE_DIRECTORIES (
+         ${MSGPACK_BOOST_DIR}
+      )
+   ENDIF ()
 ENDIF ()

 IF (MSGPACK_CHAR_SIGN)
@@ -127,7 +126,7 @@ FOREACH (F ${PREDEF_FILES})
   FILE (READ ${CMAKE_CURRENT_SOURCE_DIR}/external/boost/predef/include/boost/${F} CONTENT)
   STRING(REPLACE "BOOST_" "MSGPACK_" CONTENT ${CONTENT})
   STRING(REPLACE "boost/" "msgpack/" CONTENT ${CONTENT})
-   FILE (WRITE ${CMAKE_CURRENT_SOURCE_DIR}/include/msgpack/${F} ${CONTENT})
+   FILE (GENERATE OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/include/msgpack/${F} CONTENT ${CONTENT})
 ENDFOREACH ()

 FILE (GLOB_RECURSE PREPROCESSOR_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/external/boost/preprocessor/include/boost ${CMAKE_CURRENT_SOURCE_DIR}/external/boost/preprocessor/include/boost/*.hpp)
@@ -137,7 +136,7 @@ FOREACH (F ${PREPROCESSOR_FILES})
   FILE (READ ${CMAKE_CURRENT_SOURCE_DIR}/external/boost/preprocessor/include/boost/${F} CONTENT)
   STRING(REPLACE "BOOST_" "MSGPACK_" CONTENT ${CONTENT})
   STRING(REPLACE "boost/" "msgpack/" CONTENT ${CONTENT})
-   FILE (WRITE ${CMAKE_CURRENT_SOURCE_DIR}/include/msgpack/${F} ${CONTENT})
+   FILE (GENERATE OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/include/msgpack/${F} CONTENT ${CONTENT})
 ENDFOREACH ()

 FIND_PACKAGE (GTest)
@@ -174,17 +173,20 @@ CONFIGURE_FILE (
    @ONLY
 )

-INCLUDE_DIRECTORIES (
-    ./
-    include/
-    ${CMAKE_CURRENT_BINARY_DIR}/include/
-)
-
 IF (MSGPACK_ENABLE_SHARED)
    ADD_LIBRARY (msgpackc SHARED
        ${msgpackc_SOURCES}
        ${msgpackc_HEADERS}
    )
+
+    TARGET_INCLUDE_DIRECTORIES (msgpackc
+        PUBLIC
+            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+            $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
+            $<INSTALL_INTERFACE:include>
+        PRIVATE
+            ${CMAKE_CURRENT_SOURCE_DIR}
+    )
 ENDIF ()

 ADD_LIBRARY (msgpackc-static STATIC
@@ -192,6 +194,20 @@ ADD_LIBRARY (msgpackc-static STATIC
    ${msgpackc_HEADERS}
 )

+TARGET_INCLUDE_DIRECTORIES (msgpackc-static
+    PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
+        $<INSTALL_INTERFACE:include>
+    PRIVATE
+        ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+IF (NOT MSGPACK_ENABLE_SHARED)
+    # Add alias for subdirectories
+    ADD_LIBRARY (msgpackc ALIAS msgpackc-static)
+ENDIF ()
+
 SET_TARGET_PROPERTIES (msgpackc-static PROPERTIES OUTPUT_NAME "msgpackc")
 IF (MSGPACK_ENABLE_SHARED)
    IF (MSVC)
@@ -255,10 +271,15 @@ ELSE()
    SET (MSGPACK_INSTALLTARGETS msgpackc-static)
 ENDIF ()

-INSTALL (TARGETS ${MSGPACK_INSTALLTARGETS} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-                                           LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-                                           ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-INSTALL (DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX})
+INSTALL (TARGETS ${MSGPACK_INSTALLTARGETS} EXPORT msgpack-targets
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+)
+FOREACH (file ${msgpackc_HEADERS})
+    GET_FILENAME_COMPONENT (dir ${file} PATH)
+    INSTALL (FILES ${file} DESTINATION ${CMAKE_INSTALL_PREFIX}/${dir})
+ENDFOREACH ()
 IF (NOT MSVC)
    INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/msgpack.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 ENDIF ()
@@ -309,3 +330,39 @@ IF (DOXYGEN_FOUND)
        DEPENDS doxygen_c doxygen_cpp
    )
 ENDIF ()
+
+INCLUDE (CMakePackageConfigHelpers)
+
+SET (CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/msgpack")
+
+WRITE_BASIC_PACKAGE_VERSION_FILE (
+    msgpack-config-version.cmake
+    VERSION ${VERSION}
+    COMPATIBILITY SameMajorVersion
+)
+
+IF (NOT CMAKE_VERSION VERSION_LESS 3.0)
+    EXPORT (EXPORT msgpack-targets
+        FILE "${CMAKE_CURRENT_BINARY_DIR}/msgpack-targets.cmake"
+    )
+ENDIF ()
+
+CONFIGURE_PACKAGE_CONFIG_FILE (msgpack-config.cmake.in
+    msgpack-config.cmake
+    INSTALL_DESTINATION "${CMAKE_INSTALL_CMAKEDIR}"
+)
+
+INSTALL (EXPORT msgpack-targets
+    FILE
+        msgpack-targets.cmake
+    DESTINATION
+        "${CMAKE_INSTALL_CMAKEDIR}"
+)
+
+INSTALL (
+    FILES
+        "${CMAKE_CURRENT_BINARY_DIR}/msgpack-config.cmake"
+        "${CMAKE_CURRENT_BINARY_DIR}/msgpack-config-version.cmake"
+    DESTINATION
+        "${CMAKE_INSTALL_CMAKEDIR}"
+)
--- a/QUICKSTART-CPP.md
+++ b/QUICKSTART-CPP.md
@@ -78,7 +78,7 @@ int main(void) {

        // now starts streaming deserialization.
        msgpack::object_handle oh;
-        while(pac.next(&oh)) {
+        while(pac.next(oh)) {
            std::cout << oh.get() << std::endl;
        }

--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 `msgpack` for C/C++
 ===================

-Version 2.1.1 [![Build Status](https://travis-ci.org/msgpack/msgpack-c.svg?branch=master)](https://travis-ci.org/msgpack/msgpack-c) [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch/master?svg=true)](https://ci.appveyor.com/project/redboltz/msgpack-c/branch/master)
+Version 2.1.2 [![Build Status](https://travis-ci.org/msgpack/msgpack-c.svg?branch=master)](https://travis-ci.org/msgpack/msgpack-c) [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch/master?svg=true)](https://ci.appveyor.com/project/redboltz/msgpack-c/branch/master)

 It's like JSON but small and fast.

--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,15 +1,19 @@
-version: 2.1.0.{build}
+version: 2.1.2.{build}

+image:
+- Visual Studio 2015
 environment:
+  global:
+    BOOST_ROOT: C:\Libraries\boost_1_60_0
  matrix:
    - cpp11: -DMSGPACK_CXX11=OFF
-      boost: -DMSGPACK_BOOST=ON
+      boost: -DMSGPACK_BOOST=OFF
      msvc: '"Visual Studio 10 2010"'
    - cpp11: -DMSGPACK_CXX11=OFF
-      boost: -DMSGPACK_BOOST=ON
+      boost: -DMSGPACK_BOOST=OFF
      msvc: '"Visual Studio 11 2012"'
    - cpp11: -DMSGPACK_CXX11=OFF
-      boost: -DMSGPACK_BOOST=ON
+      boost: -DMSGPACK_BOOST=OFF
      msvc: '"Visual Studio 12 2013"'
    - cpp11: -DMSGPACK_CXX11=ON
      boost: -DMSGPACK_BOOST=ON
@@ -46,7 +50,7 @@ build_script:
 - cd ..
 - md build
 - cd build
- cmake -G %msvc% %cpp11% %boost% %x3_parse%  -DMSGPACK_BOOST_DIR=C:\Libraries\\boost_1_60_0 -DGTEST_LIBRARY=%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\build\Release\gtest.lib -DGTEST_MAIN_LIBRARY=%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\build\Release\gtest_main.lib -DGTEST_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\include -DZLIB_LIBRARY=%APPVEYOR_BUILD_FOLDER%\zlib-1.2.11\build\Release\zlib.lib -DZLIB_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\zlib-1.2.11 -DCMAKE_CXX_FLAGS='"/D_VARIADIC_MAX=10 /EHsc"' ..
+- cmake -G %msvc% %cpp11% %boost% %x3_parse% -DGTEST_LIBRARY=%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\build\Release\gtest.lib -DGTEST_MAIN_LIBRARY=%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\build\Release\gtest_main.lib -DGTEST_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\include -DZLIB_LIBRARY=%APPVEYOR_BUILD_FOLDER%\zlib-1.2.11\build\Release\zlib.lib -DZLIB_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\zlib-1.2.11 -DCMAKE_CXX_FLAGS='"/D_VARIADIC_MAX=10 /EHsc"' ..
 - cmake --build . --config Release

 test_script:
--- a/erb/v1/cpp03_define_array.hpp.erb
+++ b/erb/v1/cpp03_define_array.hpp.erb
@@ -66,7 +66,9 @@ struct define_array<A0<%1.upto(i) {|j|%>, A<%=j%><%}%>> {
            msgpack::object *ptr = o.via.array.ptr;
            switch(size) {
            default:<%(i).downto(0) {|j|%>
-            case <%=j+1%>: ptr[<%=j%>].convert(a<%=j%>);<%}%>
+            case <%=j+1%>: ptr[<%=j%>].convert(a<%=j%>);
+            // fallthrough
+<%}%>
            }
        }
    }
--- a/example/boost/CMakeLists.txt
+++ b/example/boost/CMakeLists.txt
@@ -11,6 +11,10 @@ FOREACH (source_file ${exec_PROGRAMS})
        ${source_file_we}
        ${source_file}
    )
+    TARGET_INCLUDE_DIRECTORIES (${source_file_we}
+        PRIVATE
+            $<TARGET_PROPERTY:msgpackc,INTERFACE_INCLUDE_DIRECTORIES>
+    )
    IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
        SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3")
    ENDIF ()
--- a/example/cpp03/CMakeLists.txt
+++ b/example/cpp03/CMakeLists.txt
@@ -22,7 +22,7 @@ IF (NOT MSVC)
    )
 ENDIF ()

-IF (Boost_TIMER_LIBRARY AND Boost_CHRONO_LIBRARY AND Boost_SYSTEM_LIBRARY)
+IF (MSGPACK_BOOST)
    LIST (APPEND with_boost_lib_PROGRAMS
        speed_test.cpp
        speed_test_nested_array.cpp
@@ -35,6 +35,10 @@ FOREACH (source_file ${exec_PROGRAMS})
        ${source_file_we}
        ${source_file}
    )
+    TARGET_INCLUDE_DIRECTORIES (${source_file_we}
+        PRIVATE
+            $<TARGET_PROPERTY:msgpackc,INTERFACE_INCLUDE_DIRECTORIES>
+    )
    IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
        SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3")
    ENDIF ()
@@ -53,6 +57,10 @@ FOREACH (source_file ${with_pthread_PROGRAMS})
        ${source_file_we}
        ${source_file}
    )
+    TARGET_INCLUDE_DIRECTORIES (${source_file_we}
+        PRIVATE
+            $<TARGET_PROPERTY:msgpackc,INTERFACE_INCLUDE_DIRECTORIES>
+    )
    TARGET_LINK_LIBRARIES (${source_file_we}
        ${CMAKE_THREAD_LIBS_INIT}
    )
@@ -78,6 +86,10 @@ FOREACH (source_file ${with_boost_lib_PROGRAMS})
        ${source_file_we}
        ${source_file}
    )
+    TARGET_INCLUDE_DIRECTORIES (${source_file_we}
+        PRIVATE
+            $<TARGET_PROPERTY:msgpackc,INTERFACE_INCLUDE_DIRECTORIES>
+    )
    LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
    TARGET_LINK_LIBRARIES (${source_file_we}
        ${Boost_TIMER_LIBRARY}
--- a/example/cpp11/CMakeLists.txt
+++ b/example/cpp11/CMakeLists.txt
@@ -20,6 +20,10 @@ IF (MSGPACK_CXX11)
            ${source_file_we}
            ${source_file}
        )
+        TARGET_INCLUDE_DIRECTORIES (${source_file_we}
+            PRIVATE
+                $<TARGET_PROPERTY:msgpackc,INTERFACE_INCLUDE_DIRECTORIES>
+        )
        IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
            SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g -O3 ")
        ENDIF ()
--- a/example/x3/CMakeLists.txt
+++ b/example/x3/CMakeLists.txt
@@ -7,7 +7,7 @@ IF (MSGPACK_USE_X3_PARSE)
        unpack.cpp
        parse.cpp
    )
-    IF (Boost_CONTEXT_LIBRARY AND Boost_SYSTEM_LIBRARY AND CMAKE_THREAD_LIBS_INIT)
+    IF (MSGPACK_BOOST)
        LIST (APPEND with_boost_PROGRAMS
            stream_unpack.cpp
        )
@@ -18,6 +18,10 @@ IF (MSGPACK_USE_X3_PARSE)
            ${source_file_we}
            ${source_file}
        )
+        TARGET_INCLUDE_DIRECTORIES (${source_file_we}
+            PRIVATE
+                $<TARGET_PROPERTY:msgpackc,INTERFACE_INCLUDE_DIRECTORIES>
+        )
        IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
            SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-Wall -Wextra -Werror -g ")
        ENDIF ()
@@ -40,6 +44,10 @@ IF (MSGPACK_USE_X3_PARSE)
            ${source_file_we}
            ${source_file}
        )
+        TARGET_INCLUDE_DIRECTORIES (${source_file_we}
+            PRIVATE
+                $<TARGET_PROPERTY:msgpackc,INTERFACE_INCLUDE_DIRECTORIES>
+        )
        TARGET_LINK_LIBRARIES (${source_file_we}
            ${Boost_CONTEXT_LIBRARY}
            ${Boost_SYSTEM_LIBRARY}
--- a/example/x3/stream_unpack.cpp
+++ b/example/x3/stream_unpack.cpp
@@ -21,8 +21,17 @@

 #include <boost/asio.hpp>
 #include <boost/coroutine2/all.hpp>
+
+#if defined(__clang__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#endif // defined(__clang__)
+
 #include <boost/spirit/home/support/multi_pass.hpp>

+#if defined(__clang__)
+#pragma GCC diagnostic pop
+#endif // defined(__clang__)

 namespace as = boost::asio;
 namespace x3 = boost::spirit::x3;
--- a/include/msgpack/sysdep.h
+++ b/include/msgpack/sysdep.h
@@ -45,6 +45,9 @@

 #ifdef _WIN32
 #   define _msgpack_atomic_counter_header <windows.h>
+#   if !defined(WIN32_LEAN_AND_MEAN)
+#       define WIN32_LEAN_AND_MEAN
+#   endif /* WIN32_LEAN_AND_MEAN */
    typedef long _msgpack_atomic_counter_t;
 #   define _msgpack_sync_decr_and_fetch(ptr) InterlockedDecrement(ptr)
 #   define _msgpack_sync_incr_and_fetch(ptr) InterlockedIncrement(ptr)
@@ -74,7 +77,7 @@
 #       endif
 #   endif

-#else /* _*/
+#elif defined(unix) || defined(__unix) || defined(__APPLE__)

 #include <arpa/inet.h>  /* __BYTE_ORDER */
 #   if defined(linux)
@@ -85,34 +88,34 @@

 #if MSGPACK_ENDIAN_LITTLE_BYTE

-#   ifdef _WIN32
-#       if defined(ntohs)
+#   if defined(unix) || defined(__unix) || defined(__APPLE__)
 #       define _msgpack_be16(x) ntohs(x)
-#        elif defined(_byteswap_ushort) || (defined(_MSC_VER) && _MSC_VER >= 1400)
-#            define _msgpack_be16(x) ((uint16_t)_byteswap_ushort((unsigned short)x))
-#        else
-#            define _msgpack_be16(x) ( \
-                 ((((uint16_t)x) <<  8) ) | \
-                 ((((uint16_t)x) >>  8) ) )
-#        endif
 #   else
-#        define _msgpack_be16(x) ntohs(x)
+#       if defined(ntohs)
+#           define _msgpack_be16(x) ntohs(x)
+#       elif defined(_byteswap_ushort) || (defined(_MSC_VER) && _MSC_VER >= 1400)
+#           define _msgpack_be16(x) ((uint16_t)_byteswap_ushort((unsigned short)x))
+#       else
+#           define _msgpack_be16(x) ( \
+                ((((uint16_t)x) <<  8) ) | \
+                ((((uint16_t)x) >>  8) ) )
+#        endif
 #   endif

-#   ifdef _WIN32
-#        if defined(ntohl)
-#            define _msgpack_be32(x) ntohl(x)
-#        elif defined(_byteswap_ulong) || (defined(_MSC_VER) && _MSC_VER >= 1400)
-#            define _msgpack_be32(x) ((uint32_t)_byteswap_ulong((unsigned long)x))
-#        else
-#            define _msgpack_be32(x) \
-                 ( ((((uint32_t)x) << 24)               ) | \
-                   ((((uint32_t)x) <<  8) & 0x00ff0000U ) | \
-                   ((((uint32_t)x) >>  8) & 0x0000ff00U ) | \
-                   ((((uint32_t)x) >> 24)               ) )
-#        endif
+#   if defined(unix) || defined(__unix) || defined(__APPLE__)
+#       define _msgpack_be32(x) ntohl(x)
 #   else
-#        define _msgpack_be32(x) ntohl(x)
+#       if defined(ntohl)
+#           define _msgpack_be32(x) ntohl(x)
+#       elif defined(_byteswap_ulong) || (defined(_MSC_VER) && _MSC_VER >= 1400)
+#           define _msgpack_be32(x) ((uint32_t)_byteswap_ulong((unsigned long)x))
+#       else
+#           define _msgpack_be32(x) \
+                ( ((((uint32_t)x) << 24)               ) | \
+                  ((((uint32_t)x) <<  8) & 0x00ff0000U ) | \
+                  ((((uint32_t)x) >>  8) & 0x0000ff00U ) | \
+                  ((((uint32_t)x) >> 24)               ) )
+#       endif
 #   endif

 #   if defined(_byteswap_uint64) || (defined(_MSC_VER) && _MSC_VER >= 1400)
--- a/include/msgpack/unpack_template.h
+++ b/include/msgpack/unpack_template.h
@@ -236,6 +236,7 @@ msgpack_unpack_func(int, _execute)(msgpack_unpack_struct(_context)* ctx, const c

            _fixed_trail_again:
                ++p;
+                // fallthrough

            default:
                if((size_t)(pe - p) < trail) { goto _out; }
--- a/include/msgpack/v1/adaptor/array_ref.hpp
+++ b/include/msgpack/v1/adaptor/array_ref.hpp
@@ -259,14 +259,14 @@ struct object_with_zone<msgpack::type::array_ref<T> > {
            o.via.array.size = size;
            typename T::const_iterator it(v.data->begin());
            do {
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
                *p = msgpack::object(*it, o.zone);
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
 #pragma GCC diagnostic pop
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
                ++p;
                ++it;
            } while(p < pend);
--- a/include/msgpack/v1/adaptor/detail/cpp03_define_array.hpp
+++ b/include/msgpack/v1/adaptor/detail/cpp03_define_array.hpp
--- a/include/msgpack/v1/adaptor/map.hpp
+++ b/include/msgpack/v1/adaptor/map.hpp
@@ -201,15 +201,15 @@ struct object_with_zone<std::map<K, V, Compare, Alloc> > {
            o.via.map.size = size;
            typename std::map<K, V, Compare, Alloc>::const_iterator it(v.begin());
            do {
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
                p->key = msgpack::object(it->first, o.zone);
                p->val = msgpack::object(it->second, o.zone);
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
 #pragma GCC diagnostic pop
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
                ++p;
                ++it;
            } while(p < pend);
--- a/include/msgpack/v1/adaptor/vector.hpp
+++ b/include/msgpack/v1/adaptor/vector.hpp
@@ -95,14 +95,14 @@ struct object_with_zone<std::vector<T, Alloc> > {
            o.via.array.size = size;
            typename std::vector<T, Alloc>::const_iterator it(v.begin());
            do {
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
                *p = msgpack::object(*it, o.zone);
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
 #pragma GCC diagnostic pop
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
                ++p;
                ++it;
            } while(p < pend);
--- a/include/msgpack/v1/adaptor/vector_char.hpp
+++ b/include/msgpack/v1/adaptor/vector_char.hpp
@@ -32,27 +32,27 @@ struct convert<std::vector<char, Alloc> > {
        case msgpack::type::BIN:
            v.resize(o.via.bin.size);
            if (o.via.bin.size != 0) {
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
                std::memcpy(&v.front(), o.via.bin.ptr, o.via.bin.size);
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
 #pragma GCC diagnostic pop
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
            }
            break;
        case msgpack::type::STR:
            v.resize(o.via.str.size);
            if (o.via.str.size != 0) {
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
                std::memcpy(&v.front(), o.via.str.ptr, o.via.str.size);
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
 #pragma GCC diagnostic pop
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
            }
            break;
        default:
--- a/include/msgpack/v1/adaptor/vector_unsigned_char.hpp
+++ b/include/msgpack/v1/adaptor/vector_unsigned_char.hpp
@@ -32,27 +32,27 @@ struct convert<std::vector<unsigned char, Alloc> > {
        case msgpack::type::BIN:
            v.resize(o.via.bin.size);
            if (o.via.bin.size != 0) {
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
                std::memcpy(&v.front(), o.via.bin.ptr, o.via.bin.size);
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
 #pragma GCC diagnostic pop
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
            }
            break;
        case msgpack::type::STR:
            v.resize(o.via.str.size);
            if (o.via.str.size != 0) {
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
                std::memcpy(&v.front(), o.via.str.ptr, o.via.str.size);
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
 #pragma GCC diagnostic pop
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
            }
            break;
        default:
--- a/include/msgpack/v2/parse.hpp
+++ b/include/msgpack/v2/parse.hpp
@@ -75,11 +75,15 @@ private:
            }
        }
        else {
-            m_stack.push(sv.type(), static_cast<uint32_t>(size));
            if (!sv(size)) {
                off = m_current - m_start;
                return PARSE_STOP_VISITOR;
            }
+            parse_return ret = m_stack.push(holder(), sv.type(), static_cast<uint32_t>(size));
+            if (ret != PARSE_CONTINUE) {
+                off = m_current - m_start;
+                return ret;
+            }
        }
        m_cs = MSGPACK_CS_HEADER;
        return PARSE_CONTINUE;
@@ -92,12 +96,10 @@ private:
            return PARSE_STOP_VISITOR;
        }
        parse_return ret = m_stack.consume(holder());
-        if (ret == PARSE_CONTINUE) {
-            m_cs = MSGPACK_CS_HEADER;
-        }
-        else {
+        if (ret != PARSE_CONTINUE) {
            off = m_current - m_start;
        }
+        m_cs = MSGPACK_CS_HEADER;
        return ret;
    }

@@ -145,8 +147,19 @@ private:
        unpack_stack() {
            m_stack.reserve(MSGPACK_EMBED_STACK_SIZE);
        }
-        void push(msgpack_container_type type, uint32_t rest) {
+        parse_return push(VisitorHolder& visitor_holder, msgpack_container_type type, uint32_t rest) {
            m_stack.push_back(stack_elem(type, rest));
+            switch (type) {
+            case MSGPACK_CT_ARRAY_ITEM:
+                return visitor_holder.visitor().start_array_item() ? PARSE_CONTINUE : PARSE_STOP_VISITOR;
+            case MSGPACK_CT_MAP_KEY:
+                return visitor_holder.visitor().start_map_key() ? PARSE_CONTINUE : PARSE_STOP_VISITOR;
+            case MSGPACK_CT_MAP_VALUE:
+                assert(0);
+                return PARSE_STOP_VISITOR;
+            }
+            assert(0);
+            return PARSE_STOP_VISITOR;
        }
        parse_return consume(VisitorHolder& visitor_holder) {
            while (!m_stack.empty()) {
@@ -287,11 +300,9 @@ inline parse_return context<VisitorHolder>::execute(const char* data, std::size_
            } else if(0x90 <= selector && selector <= 0x9f) { // FixArray
                parse_return ret = start_aggregate<fix_tag>(array_sv(holder()), array_ev(holder()), m_current, off);
                if (ret != PARSE_CONTINUE) return ret;
-                if (!holder().visitor().start_array_item()) return PARSE_STOP_VISITOR;
            } else if(0x80 <= selector && selector <= 0x8f) { // FixMap
                parse_return ret = start_aggregate<fix_tag>(map_sv(holder()), map_ev(holder()), m_current, off);
                if (ret != PARSE_CONTINUE) return ret;
-                if (!holder().visitor().start_map_key()) return PARSE_STOP_VISITOR;
            } else if(selector == 0xc2) { // false
                bool visret = holder().visitor().visit_boolean(false);
                parse_return upr = after_visit_proc(visret, off);
@@ -572,23 +583,19 @@ inline parse_return context<VisitorHolder>::execute(const char* data, std::size_
            case MSGPACK_CS_ARRAY_16: {
                parse_return ret = start_aggregate<uint16_t>(array_sv(holder()), array_ev(holder()), n, off);
                if (ret != PARSE_CONTINUE) return ret;
-                if (!holder().visitor().start_array_item()) return PARSE_STOP_VISITOR;

            } break;
            case MSGPACK_CS_ARRAY_32: {
                parse_return ret = start_aggregate<uint32_t>(array_sv(holder()), array_ev(holder()), n, off);
                if (ret != PARSE_CONTINUE) return ret;
-                if (!holder().visitor().start_array_item()) return PARSE_STOP_VISITOR;
            } break;
            case MSGPACK_CS_MAP_16: {
                parse_return ret = start_aggregate<uint16_t>(map_sv(holder()), map_ev(holder()), n, off);
                if (ret != PARSE_CONTINUE) return ret;
-                if (!holder().visitor().start_map_key()) return PARSE_STOP_VISITOR;
            } break;
            case MSGPACK_CS_MAP_32: {
                parse_return ret = start_aggregate<uint32_t>(map_sv(holder()), map_ev(holder()), n, off);
                if (ret != PARSE_CONTINUE) return ret;
-                if (!holder().visitor().start_map_key()) return PARSE_STOP_VISITOR;
            } break;
            default:
                off = m_current - m_start;
--- a/include/msgpack/version_master.h
+++ b/include/msgpack/version_master.h
@@ -1,3 +1,3 @@
 #define MSGPACK_VERSION_MAJOR    2
 #define MSGPACK_VERSION_MINOR    1
-#define MSGPACK_VERSION_REVISION 1
+#define MSGPACK_VERSION_REVISION 2
--- a/include/msgpack/vrefbuffer.h
+++ b/include/msgpack/vrefbuffer.h
@@ -13,7 +13,7 @@
 #include "zone.h"
 #include <stdlib.h>

-#ifndef _WIN32
+#if defined(unix) || defined(__unix) || defined(__APPLE__)
 #include <sys/uio.h>
 #else
 struct iovec {
--- a/msgpack-config.cmake.in
+++ b/msgpack-config.cmake.in
@@ -0,0 +1,23 @@
+#.rst:
+# msgpack
+# -------
+#
+# The following import targets are created
+#
+# ::
+#
+#   msgpackc-static
+#   msgpackc
+#
+
+@PACKAGE_INIT@
+
+include(CMakeFindDependencyMacro)
+
+if(NOT TARGET msgpackc AND NOT TARGET msgpackc-static)
+  include("${CMAKE_CURRENT_LIST_DIR}/msgpack-targets.cmake")
+
+  if(NOT @MSGPACK_ENABLE_SHARED@)
+    add_library(msgpackc ALIAS msgpackc-static)
+  endif()
+endif()
--- a/src/objectc.c
+++ b/src/objectc.c
@@ -339,7 +339,7 @@ int msgpack_object_print_buffer(char *buffer, size_t buffer_size, msgpack_object
        ret = snprintf(aux_buffer, aux_buffer_size, "\"");
        aux_buffer = aux_buffer + ret;
        aux_buffer_size = aux_buffer_size - ret;
-        ret = snprintf(aux_buffer, aux_buffer_size, "%.*s", o.via.str.size, o.via.str.ptr);
+        ret = snprintf(aux_buffer, aux_buffer_size, "%.*s", (int)o.via.str.size, o.via.str.ptr);
        aux_buffer = aux_buffer + ret;
        aux_buffer_size = aux_buffer_size - ret;
        ret = snprintf(aux_buffer, aux_buffer_size, "\"");
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -66,12 +66,6 @@ IF (MSGPACK_CXX11)
    )
 ENDIF ()

-IF (MSGPACK_ENABLE_SHARED)
-    SET (MSGPACK_TEST_LIB msgpackc)
-ELSE ()
-    SET (MSGPACK_TEST_LIB msgpackc-static)
-ENDIF ()
-
 FOREACH (source_file ${check_PROGRAMS})
    GET_FILENAME_COMPONENT (source_file_we ${source_file} NAME_WE)
    ADD_EXECUTABLE (
@@ -79,7 +73,7 @@ FOREACH (source_file ${check_PROGRAMS})
        ${source_file}
    )
    TARGET_LINK_LIBRARIES (${source_file_we}
-        ${MSGPACK_TEST_LIB}
+        msgpackc
        ${GTEST_BOTH_LIBRARIES}
        ${ZLIB_LIBRARIES}
        ${CMAKE_THREAD_LIBS_INIT}
@@ -105,4 +99,8 @@ ADD_EXECUTABLE (
    multi_file
    multi_file1.cpp multi_file2.cpp
 )
+TARGET_INCLUDE_DIRECTORIES (multi_file
+    PRIVATE
+        $<TARGET_PROPERTY:msgpackc,INTERFACE_INCLUDE_DIRECTORIES>
+)
 ADD_TEST (multi_file multi_file)
--- a/test/object_with_zone.cpp
+++ b/test/object_with_zone.cpp
@@ -751,14 +751,14 @@ TEST(object_with_zone, user_defined_non_virtual)

    msgpack::zone z;
    msgpack::object obj(b, z);
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
    bottom br = obj.as<bottom>();
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
 #pragma GCC diagnostic pop
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
    EXPECT_EQ(b.b, br.b);
    EXPECT_EQ(b.m1, br.m1);
    EXPECT_EQ(b.m2, br.m2);
@@ -796,14 +796,14 @@ TEST(object_with_zone, user_defined_virtual)

    msgpack::zone z;
    msgpack::object obj(b, z);
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
    v_bottom br = obj.as<v_bottom>();
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
 #pragma GCC diagnostic pop
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
    EXPECT_EQ(b.b, br.b);
    EXPECT_EQ(b.m1, br.m1);
    EXPECT_EQ(b.m2, br.m2);
--- a/test/user_class.cpp
+++ b/test/user_class.cpp
@@ -148,10 +148,10 @@ public:

    void msgpack_unpack(msgpack::object o)
    {
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
        msgpack::type::tuple<bool, msgpack::object> tuple;
        o.convert(tuple);

@@ -160,18 +160,18 @@ public:
            tuple.get<1>().convert(value.f);
        else
            tuple.get<1>().convert(value.i);
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
 #pragma GCC diagnostic pop
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
    }
 };

 TEST(MSGPACK_USER_DEFINED, simple_buffer_union_member)
 {
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
    {
        // double
        TestUnionMemberClass val1(1.0);
@@ -195,9 +195,9 @@ TEST(MSGPACK_USER_DEFINED, simple_buffer_union_member)
        EXPECT_EQ(val1.value.i, 1);
        EXPECT_EQ(val1.value.i, val2.value.i);
    }
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
 #pragma GCC diagnostic pop
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
 }

 // inheritance
@@ -396,14 +396,14 @@ TEST(MSGPACK_INHERIT, define_map_non_virtual)
    msgpack::pack(sbuf, b);
    msgpack::object_handle oh =
        msgpack::unpack(sbuf.data(), sbuf.size());
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
    dm_bottom br = oh.get().as<dm_bottom>();
-#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
 #pragma GCC diagnostic pop
-#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && !defined(__clang__)
+#endif // (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) && !defined(__clang__)
    EXPECT_EQ(b.b, br.b);
    EXPECT_EQ(b.m1, br.m1);
    EXPECT_EQ(b.m2, br.m2);
Author	SHA1	Message	Date
Takatoshi Kondo	c50fbe4ce9	Merge pull request #595 from redboltz/ver_2.1.2 Updated the version to 2.1.2.	2017-06-07 13:23:23 +09:00
Takatoshi Kondo	d7d28b6f24	Updated the version to 2.1.2.	2017-06-06 12:26:09 +09:00
Takatoshi Kondo	5ebed34376	Merge pull request #592 from leolchat/master Do not convert file everytime it is configured	2017-05-29 00:53:19 +09:00
Léonard Gérard	6871a82af7	Do not convert file everytime it is configured	2017-05-22 21:57:21 -07:00
Takatoshi Kondo	3f79968910	Merge branch 'herbrechtsmeier-ci'	2017-05-18 20:25:14 +09:00
Takatoshi Kondo	2e10adabb1	Removed X3_PARSE from osx build.	2017-05-18 19:47:53 +09:00
Takatoshi Kondo	0411ef85e7	Added warning supression pragma.	2017-05-15 16:52:29 +09:00
Takatoshi Kondo	28b6ee0db0	Updated clang version.	2017-05-15 15:55:52 +09:00
Takatoshi Kondo	3d0fa6043c	Merge branch 'ci' of https://github.com/herbrechtsmeier/msgpack-c into herbrechtsmeier-ci	2017-05-15 13:57:06 +09:00
Stefan Herbrechtsmeier	ee169c4eb5	appveyor: Disable boost for non default compiler The appveyor pre-installed software is only compiled with the default compiler and couldn't be used with other compiler versions. Signed-off-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>	2017-05-13 00:58:10 +02:00
Stefan Herbrechtsmeier	0aaf95608f	cmake: Make boost mandatory if MSGPACK_BOOST is ON Signed-off-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>	2017-05-13 00:57:03 +02:00
Stefan Herbrechtsmeier	918e7edba4	cmake: Add Boost library link directory Signed-off-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>	2017-05-13 00:56:19 +02:00
Takatoshi Kondo	88338195c0	Merge branch 'kraj-devtool'	2017-04-26 17:46:27 +09:00
Takatoshi Kondo	e90231c865	Added 'fallthrough' comments to suppress gcc7 warnings.	2017-04-24 17:16:43 +09:00
Khem Raj	15d8bb6792	Comment intentional fallthrough in case statements Fixes build with gcc7 Signed-off-by: Khem Raj <raj.khem@gmail.com>	2017-04-22 08:53:50 -07:00
Takatoshi Kondo	20ef1f925b	Merge pull request #586 from jamessan/gcc-7-fix Comment the intentional fallthrough to default from _fixed_trail_again	2017-04-17 17:22:54 +09:00
Takatoshi Kondo	89b8f4ee13	Merge pull request #580 from herbrechtsmeier/config Add cmake package config support	2017-04-17 16:38:29 +09:00
James McCoy	304ff96d04	Comment the intentional fallthrough to default from _fixed_trail_again GCC 7 added a new diagnostic, -Wimplicit-fallthrough, which is enabled with -Wextra that warns about implicitly falling through a case statement. [ 4%] Building C object CMakeFiles/msgpackc-static.dir/src/unpack.c.o /usr/lib/gcc-snapshot/bin/gcc -I/home/jamessan/src/msgpack-c/. -I/home/jamessan/src/msgpack-c/include -I/home/jamessan/src/msgpack-c/build/include -g -O2 -fdebug-prefix-map=/home/jamessan/src/msgpack-c=. -specs=/usr/share/dpkg/no-pie-compile.specs -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wall -Wextra -Werror -g -O3 -o CMakeFiles/msgpackc-static.dir/src/unpack.c.o -c /home/jamessan/src/msgpack-c/src/unpack.c In file included from /home/jamessan/src/msgpack-c/src/unpack.c:283:0: /home/jamessan/src/msgpack-c/include/msgpack/unpack_template.h: In function 'template_execute': /home/jamessan/src/msgpack-c/include/msgpack/unpack_template.h:238:17: error: this statement may fall through [-Werror=implicit-fallthrough=] ++p; ^~~ /home/jamessan/src/msgpack-c/include/msgpack/unpack_template.h:240:13: note: here default: ^~~~~~~ cc1: all warnings being treated as errors Adding the comment makes it explicit that the fallthrough is intentional, so gcc doesn't complain.	2017-04-13 11:43:27 -04:00
Takatoshi Kondo	10c1917f22	Merge pull request #582 from qehgt/fix-winsock-already-included Fix 'WinSock.h has already been included' compiler error.	2017-04-12 20:44:56 +09:00
Takatoshi Kondo	d85e731ab4	Merge pull request #585 from redboltz/fix_584 Fixed #584.	2017-04-12 19:02:24 +09:00
Takatoshi Kondo	d431e25257	Fixed #584 . Reset m_cs to MSGPACK_CS_HEADER after visitor called.	2017-04-11 12:29:12 +09:00
Stefan Herbrechtsmeier	3d82c2d651	Add cmake package config support Add support for CMake find_package command to msgpack. The package exports the two targets msgpackc-static and msgpackc if shared is enabled. The CMake find_package command works after installation of msgpack and during build of another project which adds msgpack as sub project via add_subdirectory command. Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>	2017-04-04 08:33:18 +02:00
Vasily Titskiy	2cbaa3a7db	Fix 'WinSock.h has already been included' compiler error. Fix compiler error if Boost.Asio & msgpack are used together on Windows Platform	2017-03-29 11:48:29 -04:00
Takatoshi Kondo	bfc6e45a2f	Merge pull request #579 from herbrechtsmeier/boost Add boost include directories only if MSGPACK_BOOST is enabled	2017-03-25 18:11:53 +09:00
Takatoshi Kondo	e8fa6c1aee	Merge pull request #578 from herbrechtsmeier/wildcard Pass wildcard precision of snprintf as int	2017-03-25 18:10:49 +09:00
Takatoshi Kondo	d49bec4e11	Merge pull request #577 from herbrechtsmeier/posix Detect POSIX compatiblity explicit	2017-03-25 18:10:01 +09:00
Stefan Herbrechtsmeier	004939e732	Pass wildcard precision of snprintf as int Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>	2017-03-22 13:05:47 +01:00
Stefan Herbrechtsmeier	09e8833d53	Add boost include directories only if MSGPACK_BOOST is enabled Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>	2017-03-22 13:04:03 +01:00
Stefan Herbrechtsmeier	9ed842c014	Detect POSIX compatiblity explicit Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsmeier@weidmueller.com>	2017-03-22 13:03:33 +01:00
Takatoshi Kondo	99c4d37a39	Merge pull request #574 from redboltz/fix_536 Fixed #536.	2017-03-16 08:21:49 +09:00
Takatoshi Kondo	4df2bdecda	Fixed #536 . Replaced __GNUC_MINOR__ 6 with 7 for suppress maybe-uninitialized.	2017-03-15 21:30:07 +09:00
Takatoshi Kondo	597cd63121	Merge pull request #572 from speleo3/PATH-alias CMake <= 2.8.11 compatibility	2017-03-12 11:14:42 +09:00
Thomas Holder	a51f33c02f	CMake <= 2.8.11 compatibility Keep compatible with cmake <= 2.8.11 by using the legacy PATH alias for DIRECTORY with get_filename_component.	2017-03-08 21:45:13 -05:00
Takatoshi Kondo	88032f37e1	Merge pull request #570 from lluixhi/boost Enable building against dynamically-linked Boost	2017-03-05 13:02:14 +09:00
Takatoshi Kondo	a76911a72c	Merge pull request #569 from lluixhi/master Make header install obey MSGPACK_ENABLE_CXX	2017-03-05 11:53:56 +09:00
Takatoshi Kondo	1bc27d72cc	Merge pull request #568 from dstahlke/fix Fixed spurious start_map_key/start_array_item calls	2017-03-05 11:02:05 +09:00
Aric Belsito	a6599e5fb4	Enable building against dynamically-linked Boost	2017-03-03 12:31:56 -08:00
Aric Belsito	791f55da35	Make header install obey MSGPACK_ENABLE_CXX	2017-03-03 12:25:55 -08:00
Dan L. Stahlke	e58b00016b	Fixed spurious start_map_key/start_array_item calls	2017-03-03 09:00:15 -08:00
Takatoshi Kondo	b4fe698777	Merge pull request #565 from mongi3/patch-1 Minor fix to Quickstart (broke with 2.0)	2017-02-13 15:05:13 +09:00
mongi3	e89045cfcd	Minor fix to Quickstart (broke with 2.0) non reference version won't compile with 2.0 release.	2017-02-11 15:06:42 -07:00