Merge pull request #1008 from redboltz/upd_411

Update version to 4.1.1.
2025-10-21 07:45:02 +02:00 · 2022-03-09 20:58:42 +09:00 · 2022-03-09 20:10:25 +09:00 · 2022-03-09 14:20:10 +09:00 · 2022-03-09 12:55:17 +09:00 · 2022-02-14 19:23:15 +09:00
8 changed files with 22 additions and 4 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 2022-03-09 version 4.1.1 for C++
+  * Remove chrono support on `MSGPACK_NO_BOOST` to fix  compile error.
+  * Improve build system (#1003)
+
 # 2022-02-12 version 4.1.0 for C++
  * Add experimental support for no boost dependency (#1001)
    * For cmake, add `-DMSGPACK_USE_BOOST=OFF`. For C++ compiler add `-DMSGPACK_NO_BOOST`.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -191,6 +191,8 @@ IF (MSGPACK_BUILD_DOCS)
    ENDIF ()
 ENDIF ()

+include (GNUInstallDirs)
+
 # Install library.
 INSTALL (TARGETS msgpackc-cxx
         EXPORT msgpackc-cxx-targets
@@ -211,7 +213,7 @@ INCLUDE (CMakePackageConfigHelpers)
 IF (NOT (CMAKE_VERSION VERSION_LESS 3.14))
    SET (extra_version_file_args ARCH_INDEPENDENT)
 ENDIF ()
-SET (cmake_config_path "lib/cmake/msgpackc-cxx")
+SET (cmake_config_path "${CMAKE_INSTALL_LIBDIR}/cmake/msgpackc-cxx")

 # Configure the main package file from source tree.
 CONFIGURE_PACKAGE_CONFIG_FILE (
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 `msgpack` for C++
 ===================

-Version 4.1.0 [![Build Status](https://github.com/msgpack/msgpack-c/workflows/CI/badge.svg?branch=cpp_master)](https://github.com/msgpack/msgpack-c/actions) [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch/cpp_master?svg=true)](https://ci.appveyor.com/project/redboltz/msgpack-c/branch/cpp_master)
+Version 4.1.1 [![Build Status](https://github.com/msgpack/msgpack-c/workflows/CI/badge.svg?branch=cpp_master)](https://github.com/msgpack/msgpack-c/actions) [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch/cpp_master?svg=true)](https://ci.appveyor.com/project/redboltz/msgpack-c/branch/cpp_master)
 [![codecov](https://codecov.io/gh/msgpack/msgpack-c/branch/cpp_master/graph/badge.svg)](https://codecov.io/gh/msgpack/msgpack-c/branch/cpp_master)

 It's like JSON but smaller and faster.
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 4.1.0.{build}
+version: 4.1.1.{build}

 branches:
  only:
--- a/include/msgpack/type.hpp
+++ b/include/msgpack/type.hpp
@@ -36,7 +36,11 @@
 #include "adaptor/cpp11/array.hpp"
 #include "adaptor/cpp11/array_char.hpp"
 #include "adaptor/cpp11/array_unsigned_char.hpp"
+
+#if !defined(MSGPACK_NO_BOOST)
 #include "adaptor/cpp11/chrono.hpp"
+#endif // !defined(MSGPACK_NO_BOOST)
+
 #include "adaptor/cpp11/forward_list.hpp"
 #include "adaptor/cpp11/reference_wrapper.hpp"
 #include "adaptor/cpp11/shared_ptr.hpp"
--- a/include/msgpack/version_master.hpp
+++ b/include/msgpack/version_master.hpp
@@ -1,3 +1,3 @@
 #define MSGPACK_VERSION_MAJOR    4
 #define MSGPACK_VERSION_MINOR    1
-#define MSGPACK_VERSION_REVISION 0
+#define MSGPACK_VERSION_REVISION 1
--- a/test/msgpack_cpp11.cpp
+++ b/test/msgpack_cpp11.cpp
@@ -861,6 +861,8 @@ BOOST_AUTO_TEST_CASE(no_def_con_array_simple_buffer)
    BOOST_CHECK(val1 == val2);
 }

+#if !defined(MSGPACK_NO_BOOST)
+
 BOOST_AUTO_TEST_CASE(system_clock)
 {
    std::chrono::system_clock::time_point val1;
@@ -1426,6 +1428,8 @@ BOOST_AUTO_TEST_CASE(high_resolution_clock_impl_now)
    BOOST_CHECK(val1 == val3);
 }

+#endif // !defined(MSGPACK_NO_BOOST)
+

 BOOST_AUTO_TEST_CASE(timespec_pack_convert_zero)
 {
--- a/test/object_with_zone.cpp
+++ b/test/object_with_zone.cpp
@@ -917,6 +917,8 @@ BOOST_AUTO_TEST_CASE(tuple_empty)
    BOOST_CHECK(obj.as<test_t>() == v);
 }

+#if !defined(MSGPACK_NO_BOOST)
+
 BOOST_AUTO_TEST_CASE(system_clock)
 {
    std::chrono::system_clock::time_point v;
@@ -981,6 +983,8 @@ BOOST_AUTO_TEST_CASE(system_clock_impl_max)
    BOOST_CHECK(obj.as<std::chrono::system_clock::time_point>() == v);
 }

+#endif // !defined(MSGPACK_NO_BOOST)
+
 #endif // !defined(MSGPACK_USE_CPP03)

 BOOST_AUTO_TEST_CASE(ext_empty)
Author	SHA1	Message	Date
Takatoshi Kondo	63511f29db	Merge pull request #1008 from redboltz/upd_411 Update version to 4.1.1.	2022-03-09 20:58:42 +09:00
Takatoshi Kondo	ff707d8fb5	Update version to 4.1.1.	2022-03-09 20:10:25 +09:00
Takatoshi Kondo	2c832ff91a	Merge pull request #1007 from redboltz/temp_fix_1005 Remove chrono support on MSGPACK_NO_BOOST.	2022-03-09 14:20:10 +09:00
Takatoshi Kondo	e596b6fe35	Remove chrono support on MSGPACK_NO_BOOST.	2022-03-09 12:55:17 +09:00
Takatoshi Kondo	34e411436b	Merge pull request #1003 from jamessan/config-installdir Install version/config files under CMAKE_INSTALL_LIBDIR	2022-02-14 19:23:15 +09:00
James McCoy	b4d800e6e4	Install version/config files under CMAKE_INSTALL_LIBDIR Prior to the c_master/cpp_master split, this is where the files were installed (c.f., `6e7deb8091/CMakeLists.txt (L454)`) but this was changed to use "lib/" directly when updating the C++-only packaging. Re-instate the use of CMAKE_INSTALL_LIBDIR so the user can control where they are installed and they follow the typical convention for location.	2022-02-13 17:05:08 -05:00