generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-04-24 00:57:07 +02:00
Code Issues Projects Releases Wiki Activity

Unify all package related names to msgpack-cxx.

Browse Source 
Update the version to 6.0.0.
This commit is contained in:
Takatoshi Kondo 2023-02-28 10:52:21 +09:00
parent 8824c626b4
commit ec8895155c
16 changed files with 53 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -1,3 +1,8 @@
# 2023-02-28 version 6.0.0
## << breaking changes >>
* Change CMake package name of C++ library to msgpack-cxx (#1054)
Unified all C++ package, library, cmake, tarball name become msgpack-cxx.
# 2023-01-10 version 5.0.0 for C++ # 2023-01-10 version 5.0.0 for C++
* Fix config for new MSVC preprocessor (#1040) * Fix config for new MSVC preprocessor (#1040)
## << breaking changes >> ## << breaking changes >>

54
CMakeLists.txt
View File

@ -2,9 +2,9 @@ CMAKE_MINIMUM_REQUIRED (VERSION 3.1 FATAL_ERROR)
CMAKE_POLICY (SET CMP0054 NEW) CMAKE_POLICY (SET CMP0054 NEW)
PROJECT (msgpackc-cxx LANGUAGES CXX) PROJECT (msgpack-cxx LANGUAGES CXX)
ADD_LIBRARY (msgpackc-cxx INTERFACE) ADD_LIBRARY (msgpack-cxx INTERFACE)
FILE (READ ${CMAKE_CURRENT_SOURCE_DIR}/include/msgpack/version_master.hpp contents) FILE (READ ${CMAKE_CURRENT_SOURCE_DIR}/include/msgpack/version_master.hpp contents)
STRING (REGEX MATCH "#define MSGPACK_VERSION_MAJOR *([0-9a-zA-Z_]*)" NULL_OUT ${contents}) STRING (REGEX MATCH "#define MSGPACK_VERSION_MAJOR *([0-9a-zA-Z_]*)" NULL_OUT ${contents})
@ -57,11 +57,11 @@ ENDIF ()
IF (MSGPACK_32BIT) IF (MSGPACK_32BIT)
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
TARGET_COMPILE_OPTIONS(msgpackc-cxx INTERFACE -m32) TARGET_COMPILE_OPTIONS(msgpack-cxx INTERFACE -m32)
TARGET_LINK_OPTIONS(msgpackc-cxx INTERFACE -m32) TARGET_LINK_OPTIONS(msgpack-cxx INTERFACE -m32)
ELSEIF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") ELSEIF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
TARGET_COMPILE_OPTIONS(msgpackc-cxx INTERFACE -m32) TARGET_COMPILE_OPTIONS(msgpack-cxx INTERFACE -m32)
TARGET_LINK_OPTIONS(msgpackc-cxx INTERFACE -m32) TARGET_LINK_OPTIONS(msgpack-cxx INTERFACE -m32)
ENDIF () ENDIF ()
ENDIF () ENDIF ()
@ -78,18 +78,18 @@ IF (MSGPACK_USE_BOOST)
FIND_PACKAGE (Boost REQUIRED) FIND_PACKAGE (Boost REQUIRED)
ELSE () ELSE ()
TARGET_COMPILE_DEFINITIONS(msgpackc-cxx INTERFACE MSGPACK_NO_BOOST) TARGET_COMPILE_DEFINITIONS(msgpack-cxx INTERFACE MSGPACK_NO_BOOST)
ENDIF () ENDIF ()
IF (MSGPACK_CHAR_SIGN) IF (MSGPACK_CHAR_SIGN)
TARGET_COMPILE_OPTIONS(msgpackc-cxx INTERFACE -f${MSGPACK_CHAR_SIGN}-char) TARGET_COMPILE_OPTIONS(msgpack-cxx INTERFACE -f${MSGPACK_CHAR_SIGN}-char)
ENDIF () ENDIF ()
IF (MSGPACK_DEFAULT_API_VERSION) IF (MSGPACK_DEFAULT_API_VERSION)
TARGET_COMPILE_DEFINITIONS(msgpackc-cxx INTERFACE MSGPACK_DEFAULT_API_VERSION=${MSGPACK_DEFAULT_API_VERSION}) TARGET_COMPILE_DEFINITIONS(msgpack-cxx INTERFACE MSGPACK_DEFAULT_API_VERSION=${MSGPACK_DEFAULT_API_VERSION})
ELSE () ELSE ()
SET (MSGPACK_DEFAULT_API_VERSION 3) SET (MSGPACK_DEFAULT_API_VERSION 3)
TARGET_COMPILE_DEFINITIONS(msgpackc-cxx INTERFACE MSGPACK_DEFAULT_API_VERSION=3) TARGET_COMPILE_DEFINITIONS(msgpack-cxx INTERFACE MSGPACK_DEFAULT_API_VERSION=3)
ENDIF () ENDIF ()
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
@ -112,7 +112,7 @@ ENDIF ()
INCLUDE (Files.cmake) INCLUDE (Files.cmake)
TARGET_INCLUDE_DIRECTORIES (msgpackc-cxx TARGET_INCLUDE_DIRECTORIES (msgpack-cxx
INTERFACE INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
@ -120,7 +120,7 @@ TARGET_INCLUDE_DIRECTORIES (msgpackc-cxx
) )
IF (MSGPACK_USE_BOOST) IF (MSGPACK_USE_BOOST)
TARGET_LINK_LIBRARIES (msgpackc-cxx INTERFACE Boost::boost) TARGET_LINK_LIBRARIES (msgpack-cxx INTERFACE Boost::boost)
ENDIF () ENDIF ()
IF (MSGPACK_GEN_COVERAGE) IF (MSGPACK_GEN_COVERAGE)
@ -156,7 +156,7 @@ IF (MSGPACK_FUZZ_REGRESSION)
ENDIF () ENDIF ()
IF ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "sparc") IF ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "sparc")
TARGET_COMPILE_DEFINITIONS(msgpackc-cxx INTERFACE MSGPACK_ZONE_ALIGN=8) TARGET_COMPILE_DEFINITIONS(msgpack-cxx INTERFACE MSGPACK_ZONE_ALIGN=8)
ENDIF () ENDIF ()
IF (MSGPACK_BUILD_EXAMPLES) IF (MSGPACK_BUILD_EXAMPLES)
@ -193,9 +193,9 @@ ENDIF ()
include (GNUInstallDirs) include (GNUInstallDirs)
# Install library. # Install library.
INSTALL (TARGETS msgpackc-cxx INSTALL (TARGETS msgpack-cxx
EXPORT msgpackc-cxx-targets EXPORT msgpack-cxx-targets
COMPONENT msgpackc-cxx COMPONENT msgpack-cxx
# This provides include directory in exported target # This provides include directory in exported target
# relative to prefix in single directory we've put everything in. # relative to prefix in single directory we've put everything in.
INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
@ -204,7 +204,7 @@ INSTALL (TARGETS msgpackc-cxx
# Install headers from source tree. # Install headers from source tree.
INSTALL (DIRECTORY include/ INSTALL (DIRECTORY include/
DESTINATION include DESTINATION include
COMPONENT msgpackc-cxx COMPONENT msgpack-cxx
) )
INCLUDE (CMakePackageConfigHelpers) INCLUDE (CMakePackageConfigHelpers)
@ -212,18 +212,18 @@ INCLUDE (CMakePackageConfigHelpers)
IF (NOT (CMAKE_VERSION VERSION_LESS 3.14)) IF (NOT (CMAKE_VERSION VERSION_LESS 3.14))
SET (extra_version_file_args ARCH_INDEPENDENT) SET (extra_version_file_args ARCH_INDEPENDENT)
ENDIF () ENDIF ()
SET (cmake_config_path "${CMAKE_INSTALL_LIBDIR}/cmake/msgpackc-cxx") SET (cmake_config_path "${CMAKE_INSTALL_LIBDIR}/cmake/msgpack-cxx")
# Configure the main package file from source tree. # Configure the main package file from source tree.
CONFIGURE_PACKAGE_CONFIG_FILE ( CONFIGURE_PACKAGE_CONFIG_FILE (
msgpackc-cxx-config.cmake.in msgpack-cxx-config.cmake.in
"${CMAKE_CURRENT_BINARY_DIR}/msgpackc-cxx-config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/msgpack-cxx-config.cmake"
INSTALL_DESTINATION "${cmake_config_path}" INSTALL_DESTINATION "${cmake_config_path}"
) )
# Write package version file. # Write package version file.
WRITE_BASIC_PACKAGE_VERSION_FILE ( WRITE_BASIC_PACKAGE_VERSION_FILE (
msgpackc-cxx-config-version.cmake msgpack-cxx-config-version.cmake
VERSION ${VERSION} VERSION ${VERSION}
COMPATIBILITY SameMajorVersion COMPATIBILITY SameMajorVersion
${extra_version_file_args} ${extra_version_file_args}
@ -231,16 +231,16 @@ WRITE_BASIC_PACKAGE_VERSION_FILE (
# Install the generated package version file and the main package file. # Install the generated package version file and the main package file.
INSTALL (FILES INSTALL (FILES
"${CMAKE_CURRENT_BINARY_DIR}/msgpackc-cxx-config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/msgpack-cxx-config.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/msgpackc-cxx-config-version.cmake" "${CMAKE_CURRENT_BINARY_DIR}/msgpack-cxx-config-version.cmake"
DESTINATION "${cmake_config_path}" DESTINATION "${cmake_config_path}"
COMPONENT msgpackc-cxx COMPONENT msgpack-cxx
) )
# This installs package in install tree for using installed targets. # This installs package in install tree for using installed targets.
INSTALL ( INSTALL (
EXPORT msgpackc-cxx-targets EXPORT msgpack-cxx-targets
FILE msgpackc-cxx-targets.cmake FILE msgpack-cxx-targets.cmake
DESTINATION "${cmake_config_path}" DESTINATION "${cmake_config_path}"
COMPONENT msgpackc-cxx COMPONENT msgpack-cxx
) )

2
Files.cmake
View File

@ -1,4 +1,4 @@
SET (msgpackc_HEADERS SET (msgpack-cxx_HEADERS
include/msgpack.hpp include/msgpack.hpp
include/msgpack/adaptor/adaptor_base.hpp include/msgpack/adaptor/adaptor_base.hpp
include/msgpack/adaptor/adaptor_base_decl.hpp include/msgpack/adaptor/adaptor_base_decl.hpp

4
README.md
View File

@ -1,7 +1,7 @@
`msgpack` for C++ `msgpack` for C++
=================== ===================
Version 5.0.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 6.0.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)
[![codecov](https://codecov.io/gh/msgpack/msgpack-c/branch/cpp_master/graph/badge.svg)](https://codecov.io/gh/msgpack/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. It's like JSON but smaller and faster.
@ -98,7 +98,7 @@ Usage
# ... # ...
find_package(msgpack REQUIRED) find_package(msgpack REQUIRED)
# ... # ...
target_link_libraries(your_target_name <PRIVATE/PUBLIC/INTERFACE> msgpackc-cxx) target_link_libraries(your_target_name <PRIVATE/PUBLIC/INTERFACE> msgpack-cxx)
# ... # ...
``` ```

2
appveyor.yml
View File

@ -1,4 +1,4 @@
version: 5.0.0.{build} version: 6.0.0.{build}
branches: branches:
only: only:

2
example/boost/CMakeLists.txt
View File

@ -21,7 +21,7 @@ FOREACH (source_file ${exec_PROGRAMS})
${source_file} ${source_file}
) )
TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE
msgpackc-cxx msgpack-cxx
Boost::system Boost::system
Threads::Threads Threads::Threads
) )

6
example/cpp03/CMakeLists.txt
View File

@ -43,7 +43,7 @@ FOREACH (source_file ${exec_PROGRAMS})
${source_file} ${source_file}
) )
TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE
msgpackc-cxx msgpack-cxx
) )
IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra") SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra")
@ -64,7 +64,7 @@ FOREACH (source_file ${with_pthread_PROGRAMS})
${source_file} ${source_file}
) )
TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE
msgpackc-cxx msgpack-cxx
Threads::Threads Threads::Threads
) )
IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
@ -86,7 +86,7 @@ FOREACH (source_file ${with_boost_lib_PROGRAMS})
${source_file} ${source_file}
) )
TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE
msgpackc-cxx msgpack-cxx
Boost::timer Boost::timer
) )
IF (NOT MSVC AND NOT APPLE) IF (NOT MSVC AND NOT APPLE)

2
example/cpp11/CMakeLists.txt
View File

@ -17,7 +17,7 @@ IF (MSGPACK_CXX11 OR MSGPACK_CXX14 OR MSGPACK_CXX17)
${source_file} ${source_file}
) )
TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE
msgpackc-cxx msgpack-cxx
) )
IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra") SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra")

4
example/x3/CMakeLists.txt
View File

@ -15,7 +15,7 @@ IF (MSGPACK_USE_X3_PARSE AND MSGPACK_DEFAULT_API_VERSION VERSION_GREATER 1)
${source_file_we} ${source_file_we}
${source_file} ${source_file}
) )
TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE msgpackc-cxx) TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE msgpack-cxx)
IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra") SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra")
@ -40,7 +40,7 @@ IF (MSGPACK_USE_X3_PARSE AND MSGPACK_DEFAULT_API_VERSION VERSION_GREATER 1)
${source_file} ${source_file}
) )
TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE
msgpackc-cxx msgpack-cxx
Boost::context Boost::context
Boost::system Boost::system
Threads::Threads Threads::Threads

2
fuzz/CMakeLists.txt
View File

@ -16,7 +16,7 @@ FOREACH (source_file ${check_PROGRAMS})
$<IF:$<BOOL:${MSGPACK_USE_STATIC_BOOST}>,,BOOST_TEST_DYN_LINK>) $<IF:$<BOOL:${MSGPACK_USE_STATIC_BOOST}>,,BOOST_TEST_DYN_LINK>)
TARGET_LINK_LIBRARIES (${source_file_we} TARGET_LINK_LIBRARIES (${source_file_we}
msgpackc-cxx msgpack-cxx
Threads::Threads Threads::Threads
Boost::filesystem Boost::filesystem
Boost::system Boost::system

2
include/msgpack/version_master.hpp
View File

@ -1,3 +1,3 @@
#define MSGPACK_VERSION_MAJOR 5 #define MSGPACK_VERSION_MAJOR 6
#define MSGPACK_VERSION_MINOR 0 #define MSGPACK_VERSION_MINOR 0
#define MSGPACK_VERSION_REVISION 0 #define MSGPACK_VERSION_REVISION 0

2
make_file_list.sh
View File

@ -2,7 +2,7 @@
find include -name "*.hpp" -or -name "*.h" | sed -e 's/\s\+/\n/g' | LC_ALL=C sort > cpp_headers.tmp find include -name "*.hpp" -or -name "*.h" | sed -e 's/\s\+/\n/g' | LC_ALL=C sort > cpp_headers.tmp
echo 'SET (msgpackc_HEADERS' > Files.cmake echo 'SET (msgpack-cxx_HEADERS' > Files.cmake
cat cpp_headers.tmp | sed -e 's/^/ /g' >> Files.cmake cat cpp_headers.tmp | sed -e 's/^/ /g' >> Files.cmake
echo ')' >> Files.cmake echo ')' >> Files.cmake

2
makedist.sh
View File

@ -32,7 +32,7 @@ tar --append --file=$filename $prefix/ChangeLog
tar --append --file=$filename $prefix/NEWS tar --append --file=$filename $prefix/NEWS
tar --append --file=$filename $prefix/COPYING tar --append --file=$filename $prefix/COPYING
tar --append --file=$filename $prefix/README tar --append --file=$filename $prefix/README
tar --append --file=$filename $prefix/msgpackc-cxx-config.cmake.in tar --append --file=$filename $prefix/msgpack-cxx-config.cmake.in
rm -f $prefix rm -f $prefix
gzip -f $filename gzip -f $filename

4
msgpackc-cxx-config.cmake.in → msgpack-cxx-config.cmake.in
View File

@ -6,6 +6,6 @@ IF (@MSGPACK_USE_BOOST@)
find_dependency(Boost REQUIRED) find_dependency(Boost REQUIRED)
ENDIF () ENDIF ()
include("${CMAKE_CURRENT_LIST_DIR}/msgpackc-cxx-targets.cmake") include("${CMAKE_CURRENT_LIST_DIR}/msgpack-cxx-targets.cmake")
check_required_components(msgpackc-cxx) check_required_components(msgpack-cxx)

4
test-install/CMakeLists.txt
View File

@ -4,7 +4,7 @@ project(test-install LANGUAGES CXX)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
find_package(msgpackc-cxx REQUIRED) find_package(msgpack-cxx REQUIRED)
add_executable(test-install simple.cpp) add_executable(test-install simple.cpp)
target_link_libraries(test-install PRIVATE msgpackc-cxx) target_link_libraries(test-install PRIVATE msgpack-cxx)

4
test/CMakeLists.txt
View File

@ -78,7 +78,7 @@ FOREACH (source_file ${check_PROGRAMS})
$<IF:$<BOOL:${MSGPACK_USE_STATIC_BOOST}>,,BOOST_TEST_DYN_LINK>) $<IF:$<BOOL:${MSGPACK_USE_STATIC_BOOST}>,,BOOST_TEST_DYN_LINK>)
TARGET_LINK_LIBRARIES (${source_file_we} TARGET_LINK_LIBRARIES (${source_file_we}
msgpackc-cxx msgpack-cxx
Boost::system Boost::system
Boost::unit_test_framework Boost::unit_test_framework
Threads::Threads Threads::Threads
@ -109,7 +109,7 @@ ADD_EXECUTABLE (
) )
TARGET_LINK_LIBRARIES (multi_file TARGET_LINK_LIBRARIES (multi_file
msgpackc-cxx msgpack-cxx
) )
ADD_TEST (multi_file multi_file) ADD_TEST (multi_file multi_file)