From ec8895155c66943b4b1586d1fafaf81b61745a79 Mon Sep 17 00:00:00 2001 From: Takatoshi Kondo Date: Tue, 28 Feb 2023 10:52:21 +0900 Subject: [PATCH] Unify all package related names to msgpack-cxx. Update the version to 6.0.0. --- CHANGELOG.md | 5 ++ CMakeLists.txt | 54 +++++++++---------- Files.cmake | 2 +- README.md | 4 +- appveyor.yml | 2 +- example/boost/CMakeLists.txt | 2 +- example/cpp03/CMakeLists.txt | 6 +-- example/cpp11/CMakeLists.txt | 2 +- example/x3/CMakeLists.txt | 4 +- fuzz/CMakeLists.txt | 2 +- include/msgpack/version_master.hpp | 2 +- make_file_list.sh | 2 +- makedist.sh | 2 +- ...ig.cmake.in => msgpack-cxx-config.cmake.in | 4 +- test-install/CMakeLists.txt | 4 +- test/CMakeLists.txt | 4 +- 16 files changed, 53 insertions(+), 48 deletions(-) rename msgpackc-cxx-config.cmake.in => msgpack-cxx-config.cmake.in (54%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2576fecb9..a88295d54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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++ * Fix config for new MSVC preprocessor (#1040) ## << breaking changes >> diff --git a/CMakeLists.txt b/CMakeLists.txt index cdfb5f18d..d44df4e21 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,9 +2,9 @@ CMAKE_MINIMUM_REQUIRED (VERSION 3.1 FATAL_ERROR) 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) STRING (REGEX MATCH "#define MSGPACK_VERSION_MAJOR *([0-9a-zA-Z_]*)" NULL_OUT ${contents}) @@ -57,11 +57,11 @@ ENDIF () IF (MSGPACK_32BIT) IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - TARGET_COMPILE_OPTIONS(msgpackc-cxx INTERFACE -m32) - TARGET_LINK_OPTIONS(msgpackc-cxx INTERFACE -m32) + TARGET_COMPILE_OPTIONS(msgpack-cxx INTERFACE -m32) + TARGET_LINK_OPTIONS(msgpack-cxx INTERFACE -m32) ELSEIF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") - TARGET_COMPILE_OPTIONS(msgpackc-cxx INTERFACE -m32) - TARGET_LINK_OPTIONS(msgpackc-cxx INTERFACE -m32) + TARGET_COMPILE_OPTIONS(msgpack-cxx INTERFACE -m32) + TARGET_LINK_OPTIONS(msgpack-cxx INTERFACE -m32) ENDIF () ENDIF () @@ -78,18 +78,18 @@ IF (MSGPACK_USE_BOOST) FIND_PACKAGE (Boost REQUIRED) ELSE () - TARGET_COMPILE_DEFINITIONS(msgpackc-cxx INTERFACE MSGPACK_NO_BOOST) + TARGET_COMPILE_DEFINITIONS(msgpack-cxx INTERFACE MSGPACK_NO_BOOST) ENDIF () 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 () 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 () 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 () IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") @@ -112,7 +112,7 @@ ENDIF () INCLUDE (Files.cmake) -TARGET_INCLUDE_DIRECTORIES (msgpackc-cxx +TARGET_INCLUDE_DIRECTORIES (msgpack-cxx INTERFACE $ $ @@ -120,7 +120,7 @@ TARGET_INCLUDE_DIRECTORIES (msgpackc-cxx ) IF (MSGPACK_USE_BOOST) - TARGET_LINK_LIBRARIES (msgpackc-cxx INTERFACE Boost::boost) + TARGET_LINK_LIBRARIES (msgpack-cxx INTERFACE Boost::boost) ENDIF () IF (MSGPACK_GEN_COVERAGE) @@ -156,7 +156,7 @@ IF (MSGPACK_FUZZ_REGRESSION) ENDIF () 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 () IF (MSGPACK_BUILD_EXAMPLES) @@ -193,9 +193,9 @@ ENDIF () include (GNUInstallDirs) # Install library. -INSTALL (TARGETS msgpackc-cxx - EXPORT msgpackc-cxx-targets - COMPONENT msgpackc-cxx +INSTALL (TARGETS msgpack-cxx + EXPORT msgpack-cxx-targets + COMPONENT msgpack-cxx # This provides include directory in exported target # relative to prefix in single directory we've put everything in. INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" @@ -204,7 +204,7 @@ INSTALL (TARGETS msgpackc-cxx # Install headers from source tree. INSTALL (DIRECTORY include/ DESTINATION include - COMPONENT msgpackc-cxx + COMPONENT msgpack-cxx ) INCLUDE (CMakePackageConfigHelpers) @@ -212,18 +212,18 @@ INCLUDE (CMakePackageConfigHelpers) IF (NOT (CMAKE_VERSION VERSION_LESS 3.14)) SET (extra_version_file_args ARCH_INDEPENDENT) 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_PACKAGE_CONFIG_FILE ( - msgpackc-cxx-config.cmake.in - "${CMAKE_CURRENT_BINARY_DIR}/msgpackc-cxx-config.cmake" + msgpack-cxx-config.cmake.in + "${CMAKE_CURRENT_BINARY_DIR}/msgpack-cxx-config.cmake" INSTALL_DESTINATION "${cmake_config_path}" ) # Write package version file. WRITE_BASIC_PACKAGE_VERSION_FILE ( - msgpackc-cxx-config-version.cmake + msgpack-cxx-config-version.cmake VERSION ${VERSION} COMPATIBILITY SameMajorVersion ${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 (FILES - "${CMAKE_CURRENT_BINARY_DIR}/msgpackc-cxx-config.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/msgpackc-cxx-config-version.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/msgpack-cxx-config.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/msgpack-cxx-config-version.cmake" DESTINATION "${cmake_config_path}" - COMPONENT msgpackc-cxx + COMPONENT msgpack-cxx ) # This installs package in install tree for using installed targets. INSTALL ( - EXPORT msgpackc-cxx-targets - FILE msgpackc-cxx-targets.cmake + EXPORT msgpack-cxx-targets + FILE msgpack-cxx-targets.cmake DESTINATION "${cmake_config_path}" - COMPONENT msgpackc-cxx + COMPONENT msgpack-cxx ) diff --git a/Files.cmake b/Files.cmake index 9e508244b..5cdf80afd 100644 --- a/Files.cmake +++ b/Files.cmake @@ -1,4 +1,4 @@ -SET (msgpackc_HEADERS +SET (msgpack-cxx_HEADERS include/msgpack.hpp include/msgpack/adaptor/adaptor_base.hpp include/msgpack/adaptor/adaptor_base_decl.hpp diff --git a/README.md b/README.md index 5f50e8864..9f6a459b6 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ `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) It's like JSON but smaller and faster. @@ -98,7 +98,7 @@ Usage # ... find_package(msgpack REQUIRED) # ... - target_link_libraries(your_target_name msgpackc-cxx) + target_link_libraries(your_target_name msgpack-cxx) # ... ``` diff --git a/appveyor.yml b/appveyor.yml index 5168b4410..4218f3a3d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 5.0.0.{build} +version: 6.0.0.{build} branches: only: diff --git a/example/boost/CMakeLists.txt b/example/boost/CMakeLists.txt index 10730f17d..ad9c979ce 100644 --- a/example/boost/CMakeLists.txt +++ b/example/boost/CMakeLists.txt @@ -21,7 +21,7 @@ FOREACH (source_file ${exec_PROGRAMS}) ${source_file} ) TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE - msgpackc-cxx + msgpack-cxx Boost::system Threads::Threads ) diff --git a/example/cpp03/CMakeLists.txt b/example/cpp03/CMakeLists.txt index ec36b8305..90c493f04 100644 --- a/example/cpp03/CMakeLists.txt +++ b/example/cpp03/CMakeLists.txt @@ -43,7 +43,7 @@ FOREACH (source_file ${exec_PROGRAMS}) ${source_file} ) 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") 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} ) TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE - msgpackc-cxx + msgpack-cxx Threads::Threads ) 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} ) TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE - msgpackc-cxx + msgpack-cxx Boost::timer ) IF (NOT MSVC AND NOT APPLE) diff --git a/example/cpp11/CMakeLists.txt b/example/cpp11/CMakeLists.txt index 1f6163987..be16d118d 100644 --- a/example/cpp11/CMakeLists.txt +++ b/example/cpp11/CMakeLists.txt @@ -17,7 +17,7 @@ IF (MSGPACK_CXX11 OR MSGPACK_CXX14 OR MSGPACK_CXX17) ${source_file} ) 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") SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra") diff --git a/example/x3/CMakeLists.txt b/example/x3/CMakeLists.txt index 2b372b197..5fc6c1afa 100644 --- a/example/x3/CMakeLists.txt +++ b/example/x3/CMakeLists.txt @@ -15,7 +15,7 @@ IF (MSGPACK_USE_X3_PARSE AND MSGPACK_DEFAULT_API_VERSION VERSION_GREATER 1) ${source_file_we} ${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") 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} ) TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE - msgpackc-cxx + msgpack-cxx Boost::context Boost::system Threads::Threads diff --git a/fuzz/CMakeLists.txt b/fuzz/CMakeLists.txt index 120229641..819130ed2 100644 --- a/fuzz/CMakeLists.txt +++ b/fuzz/CMakeLists.txt @@ -16,7 +16,7 @@ FOREACH (source_file ${check_PROGRAMS}) $,,BOOST_TEST_DYN_LINK>) TARGET_LINK_LIBRARIES (${source_file_we} - msgpackc-cxx + msgpack-cxx Threads::Threads Boost::filesystem Boost::system diff --git a/include/msgpack/version_master.hpp b/include/msgpack/version_master.hpp index 5f40c4679..fdab08894 100644 --- a/include/msgpack/version_master.hpp +++ b/include/msgpack/version_master.hpp @@ -1,3 +1,3 @@ -#define MSGPACK_VERSION_MAJOR 5 +#define MSGPACK_VERSION_MAJOR 6 #define MSGPACK_VERSION_MINOR 0 #define MSGPACK_VERSION_REVISION 0 diff --git a/make_file_list.sh b/make_file_list.sh index d875c4423..5156a1614 100755 --- a/make_file_list.sh +++ b/make_file_list.sh @@ -2,7 +2,7 @@ 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 echo ')' >> Files.cmake diff --git a/makedist.sh b/makedist.sh index 67eaef9a7..9abf598ff 100755 --- a/makedist.sh +++ b/makedist.sh @@ -32,7 +32,7 @@ tar --append --file=$filename $prefix/ChangeLog tar --append --file=$filename $prefix/NEWS tar --append --file=$filename $prefix/COPYING 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 gzip -f $filename diff --git a/msgpackc-cxx-config.cmake.in b/msgpack-cxx-config.cmake.in similarity index 54% rename from msgpackc-cxx-config.cmake.in rename to msgpack-cxx-config.cmake.in index 09102c6a4..74738c896 100644 --- a/msgpackc-cxx-config.cmake.in +++ b/msgpack-cxx-config.cmake.in @@ -6,6 +6,6 @@ IF (@MSGPACK_USE_BOOST@) find_dependency(Boost REQUIRED) 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) diff --git a/test-install/CMakeLists.txt b/test-install/CMakeLists.txt index e9ec3ba52..874198b61 100644 --- a/test-install/CMakeLists.txt +++ b/test-install/CMakeLists.txt @@ -4,7 +4,7 @@ project(test-install LANGUAGES CXX) set(CMAKE_CXX_STANDARD_REQUIRED ON) -find_package(msgpackc-cxx REQUIRED) +find_package(msgpack-cxx REQUIRED) add_executable(test-install simple.cpp) -target_link_libraries(test-install PRIVATE msgpackc-cxx) +target_link_libraries(test-install PRIVATE msgpack-cxx) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 3e81fefd6..e0ebf2583 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -78,7 +78,7 @@ FOREACH (source_file ${check_PROGRAMS}) $,,BOOST_TEST_DYN_LINK>) TARGET_LINK_LIBRARIES (${source_file_we} - msgpackc-cxx + msgpack-cxx Boost::system Boost::unit_test_framework Threads::Threads @@ -109,7 +109,7 @@ ADD_EXECUTABLE ( ) TARGET_LINK_LIBRARIES (multi_file - msgpackc-cxx + msgpack-cxx ) ADD_TEST (multi_file multi_file)