Skip to content

Commit bc2c446

Browse files
redboltzredboltz
authored
Merge pull request #1054 from redboltz/unify_project_name_cxx
Unify all package related names to msgpack-cxx.
2 parents 8824c62 + ec88951 commit bc2c446

File tree

16 files changed

+53
-48
lines changed

16 files changed

+53
-48
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# 2023-02-28 version 6.0.0
2+
## << breaking changes >>
3+
* Change CMake package name of C++ library to msgpack-cxx (#1054)
4+
Unified all C++ package, library, cmake, tarball name become msgpack-cxx.
5+
16
# 2023-01-10 version 5.0.0 for C++
27
* Fix config for new MSVC preprocessor (#1040)
38
## << breaking changes >>

‎CMakeLists.txt‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ CMAKE_MINIMUM_REQUIRED (VERSION 3.1 FATAL_ERROR)
22

33
CMAKE_POLICY (SET CMP0054 NEW)
44

5-
PROJECT (msgpackc-cxx LANGUAGES CXX)
5+
PROJECT (msgpack-cxx LANGUAGES CXX)
66

7-
ADD_LIBRARY (msgpackc-cxx INTERFACE)
7+
ADD_LIBRARY (msgpack-cxx INTERFACE)
88

99
FILE (READ ${CMAKE_CURRENT_SOURCE_DIR}/include/msgpack/version_master.hpp contents)
1010
STRING (REGEX MATCH "#define MSGPACK_VERSION_MAJOR *([0-9a-zA-Z_]*)" NULL_OUT ${contents})
@@ -57,11 +57,11 @@ ENDIF ()
5757

5858
IF (MSGPACK_32BIT)
5959
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
60-
TARGET_COMPILE_OPTIONS(msgpackc-cxx INTERFACE -m32)
61-
TARGET_LINK_OPTIONS(msgpackc-cxx INTERFACE -m32)
60+
TARGET_COMPILE_OPTIONS(msgpack-cxx INTERFACE -m32)
61+
TARGET_LINK_OPTIONS(msgpack-cxx INTERFACE -m32)
6262
ELSEIF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
63-
TARGET_COMPILE_OPTIONS(msgpackc-cxx INTERFACE -m32)
64-
TARGET_LINK_OPTIONS(msgpackc-cxx INTERFACE -m32)
63+
TARGET_COMPILE_OPTIONS(msgpack-cxx INTERFACE -m32)
64+
TARGET_LINK_OPTIONS(msgpack-cxx INTERFACE -m32)
6565
ENDIF ()
6666
ENDIF ()
6767

@@ -78,18 +78,18 @@ IF (MSGPACK_USE_BOOST)
7878

7979
FIND_PACKAGE (Boost REQUIRED)
8080
ELSE ()
81-
TARGET_COMPILE_DEFINITIONS(msgpackc-cxx INTERFACE MSGPACK_NO_BOOST)
81+
TARGET_COMPILE_DEFINITIONS(msgpack-cxx INTERFACE MSGPACK_NO_BOOST)
8282
ENDIF ()
8383

8484
IF (MSGPACK_CHAR_SIGN)
85-
TARGET_COMPILE_OPTIONS(msgpackc-cxx INTERFACE -f${MSGPACK_CHAR_SIGN}-char)
85+
TARGET_COMPILE_OPTIONS(msgpack-cxx INTERFACE -f${MSGPACK_CHAR_SIGN}-char)
8686
ENDIF ()
8787

8888
IF (MSGPACK_DEFAULT_API_VERSION)
89-
TARGET_COMPILE_DEFINITIONS(msgpackc-cxx INTERFACE MSGPACK_DEFAULT_API_VERSION=${MSGPACK_DEFAULT_API_VERSION})
89+
TARGET_COMPILE_DEFINITIONS(msgpack-cxx INTERFACE MSGPACK_DEFAULT_API_VERSION=${MSGPACK_DEFAULT_API_VERSION})
9090
ELSE ()
9191
SET (MSGPACK_DEFAULT_API_VERSION 3)
92-
TARGET_COMPILE_DEFINITIONS(msgpackc-cxx INTERFACE MSGPACK_DEFAULT_API_VERSION=3)
92+
TARGET_COMPILE_DEFINITIONS(msgpack-cxx INTERFACE MSGPACK_DEFAULT_API_VERSION=3)
9393
ENDIF ()
9494

9595
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
@@ -112,15 +112,15 @@ ENDIF ()
112112

113113
INCLUDE (Files.cmake)
114114

115-
TARGET_INCLUDE_DIRECTORIES (msgpackc-cxx
115+
TARGET_INCLUDE_DIRECTORIES (msgpack-cxx
116116
INTERFACE
117117
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
118118
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
119119
$<INSTALL_INTERFACE:include>
120120
)
121121

122122
IF (MSGPACK_USE_BOOST)
123-
TARGET_LINK_LIBRARIES (msgpackc-cxx INTERFACE Boost::boost)
123+
TARGET_LINK_LIBRARIES (msgpack-cxx INTERFACE Boost::boost)
124124
ENDIF ()
125125

126126
IF (MSGPACK_GEN_COVERAGE)
@@ -156,7 +156,7 @@ IF (MSGPACK_FUZZ_REGRESSION)
156156
ENDIF ()
157157

158158
IF ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "sparc")
159-
TARGET_COMPILE_DEFINITIONS(msgpackc-cxx INTERFACE MSGPACK_ZONE_ALIGN=8)
159+
TARGET_COMPILE_DEFINITIONS(msgpack-cxx INTERFACE MSGPACK_ZONE_ALIGN=8)
160160
ENDIF ()
161161

162162
IF (MSGPACK_BUILD_EXAMPLES)
@@ -193,9 +193,9 @@ ENDIF ()
193193
include (GNUInstallDirs)
194194

195195
# Install library.
196-
INSTALL (TARGETS msgpackc-cxx
197-
EXPORT msgpackc-cxx-targets
198-
COMPONENT msgpackc-cxx
196+
INSTALL (TARGETS msgpack-cxx
197+
EXPORT msgpack-cxx-targets
198+
COMPONENT msgpack-cxx
199199
# This provides include directory in exported target
200200
# relative to prefix in single directory we've put everything in.
201201
INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
@@ -204,43 +204,43 @@ INSTALL (TARGETS msgpackc-cxx
204204
# Install headers from source tree.
205205
INSTALL (DIRECTORY include/
206206
DESTINATION include
207-
COMPONENT msgpackc-cxx
207+
COMPONENT msgpack-cxx
208208
)
209209

210210
INCLUDE (CMakePackageConfigHelpers)
211211

212212
IF (NOT (CMAKE_VERSION VERSION_LESS 3.14))
213213
SET (extra_version_file_args ARCH_INDEPENDENT)
214214
ENDIF ()
215-
SET (cmake_config_path "${CMAKE_INSTALL_LIBDIR}/cmake/msgpackc-cxx")
215+
SET (cmake_config_path "${CMAKE_INSTALL_LIBDIR}/cmake/msgpack-cxx")
216216

217217
# Configure the main package file from source tree.
218218
CONFIGURE_PACKAGE_CONFIG_FILE (
219-
msgpackc-cxx-config.cmake.in
220-
"${CMAKE_CURRENT_BINARY_DIR}/msgpackc-cxx-config.cmake"
219+
msgpack-cxx-config.cmake.in
220+
"${CMAKE_CURRENT_BINARY_DIR}/msgpack-cxx-config.cmake"
221221
INSTALL_DESTINATION "${cmake_config_path}"
222222
)
223223

224224
# Write package version file.
225225
WRITE_BASIC_PACKAGE_VERSION_FILE (
226-
msgpackc-cxx-config-version.cmake
226+
msgpack-cxx-config-version.cmake
227227
VERSION ${VERSION}
228228
COMPATIBILITY SameMajorVersion
229229
${extra_version_file_args}
230230
)
231231

232232
# Install the generated package version file and the main package file.
233233
INSTALL (FILES
234-
"${CMAKE_CURRENT_BINARY_DIR}/msgpackc-cxx-config.cmake"
235-
"${CMAKE_CURRENT_BINARY_DIR}/msgpackc-cxx-config-version.cmake"
234+
"${CMAKE_CURRENT_BINARY_DIR}/msgpack-cxx-config.cmake"
235+
"${CMAKE_CURRENT_BINARY_DIR}/msgpack-cxx-config-version.cmake"
236236
DESTINATION "${cmake_config_path}"
237-
COMPONENT msgpackc-cxx
237+
COMPONENT msgpack-cxx
238238
)
239239

240240
# This installs package in install tree for using installed targets.
241241
INSTALL (
242-
EXPORT msgpackc-cxx-targets
243-
FILE msgpackc-cxx-targets.cmake
242+
EXPORT msgpack-cxx-targets
243+
FILE msgpack-cxx-targets.cmake
244244
DESTINATION "${cmake_config_path}"
245-
COMPONENT msgpackc-cxx
245+
COMPONENT msgpack-cxx
246246
)

‎Files.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
SET (msgpackc_HEADERS
1+
SET (msgpack-cxx_HEADERS
22
include/msgpack.hpp
33
include/msgpack/adaptor/adaptor_base.hpp
44
include/msgpack/adaptor/adaptor_base_decl.hpp

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
`msgpack` for C++
22
===================
33

4-
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)
4+
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)
55
[![codecov](https://codecov.io/gh/msgpack/msgpack-c/branch/cpp_master/graph/badge.svg)](https://codecov.io/gh/msgpack/msgpack-c/branch/cpp_master)
66

77
It's like JSON but smaller and faster.
@@ -98,7 +98,7 @@ Usage
9898
# ...
9999
find_package(msgpack REQUIRED)
100100
# ...
101-
target_link_libraries(your_target_name <PRIVATE/PUBLIC/INTERFACE> msgpackc-cxx)
101+
target_link_libraries(your_target_name <PRIVATE/PUBLIC/INTERFACE> msgpack-cxx)
102102
# ...
103103
```
104104

‎appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: 5.0.0.{build}
1+
version: 6.0.0.{build}
22

33
branches:
44
only:

‎example/boost/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ FOREACH (source_file ${exec_PROGRAMS})
2121
${source_file}
2222
)
2323
TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE
24-
msgpackc-cxx
24+
msgpack-cxx
2525
Boost::system
2626
Threads::Threads
2727
)

‎example/cpp03/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ FOREACH (source_file ${exec_PROGRAMS})
4343
${source_file}
4444
)
4545
TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE
46-
msgpackc-cxx
46+
msgpack-cxx
4747
)
4848
IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
4949
SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra")
@@ -64,7 +64,7 @@ FOREACH (source_file ${with_pthread_PROGRAMS})
6464
${source_file}
6565
)
6666
TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE
67-
msgpackc-cxx
67+
msgpack-cxx
6868
Threads::Threads
6969
)
7070
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})
8686
${source_file}
8787
)
8888
TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE
89-
msgpackc-cxx
89+
msgpack-cxx
9090
Boost::timer
9191
)
9292
IF (NOT MSVC AND NOT APPLE)

‎example/cpp11/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ IF (MSGPACK_CXX11 OR MSGPACK_CXX14 OR MSGPACK_CXX17)
1717
${source_file}
1818
)
1919
TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE
20-
msgpackc-cxx
20+
msgpack-cxx
2121
)
2222
IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
2323
SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra")

‎example/x3/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ IF (MSGPACK_USE_X3_PARSE AND MSGPACK_DEFAULT_API_VERSION VERSION_GREATER 1)
1515
${source_file_we}
1616
${source_file}
1717
)
18-
TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE msgpackc-cxx)
18+
TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE msgpack-cxx)
1919

2020
IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
2121
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)
4040
${source_file}
4141
)
4242
TARGET_LINK_LIBRARIES (${source_file_we} PRIVATE
43-
msgpackc-cxx
43+
msgpack-cxx
4444
Boost::context
4545
Boost::system
4646
Threads::Threads

‎fuzz/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ FOREACH (source_file ${check_PROGRAMS})
1616
$<IF:$<BOOL:${MSGPACK_USE_STATIC_BOOST}>,,BOOST_TEST_DYN_LINK>)
1717

1818
TARGET_LINK_LIBRARIES (${source_file_we}
19-
msgpackc-cxx
19+
msgpack-cxx
2020
Threads::Threads
2121
Boost::filesystem
2222
Boost::system

0 commit comments

Comments
 (0)