Skip to content

Commit b3de6f8

Browse files
redboltzredboltz
authored
Merge pull request #1053 from redboltz/unify_project_name_c
Unify all package related names to msgpack-c.
2 parents 551308a + 01f3d24 commit b3de6f8

15 files changed

+82
-77
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Makefile.in
1919
/config.log
2020
/config.status
2121
/libtool
22-
/msgpack.pc
22+
/msgpack-c.pc
2323
/src/msgpack/version.h
2424
/src/msgpack/version.hpp
2525
/stamp-h1

‎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-c (#1053)
4+
Unified all C package, library, cmake, tarball name become msgpack-c.
5+
16
# 2023-01-10 version 5.0.0
27
* Add additional address sanitizer for CI. (#1023)
38
## << breaking changes >>

‎CMakeLists.txt‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ IF ((CMAKE_VERSION VERSION_GREATER 3.1) OR
55
CMAKE_POLICY(SET CMP0054 NEW)
66
ENDIF ()
77

8-
PROJECT (msgpackc)
8+
PROJECT (msgpack-c)
99

1010
FILE (READ ${CMAKE_CURRENT_SOURCE_DIR}/include/msgpack/version_master.h contents)
1111
STRING (REGEX MATCH "#define MSGPACK_VERSION_MAJOR *([0-9a-zA-Z_]*)" NULL_OUT ${contents})
@@ -31,7 +31,7 @@ IF (BIGENDIAN)
3131
SET(MSGPACK_ENDIAN_LITTLE_BYTE 0)
3232
ELSE ()
3333
SET(MSGPACK_ENDIAN_BIG_BYTE 0)
34-
SET(MSGPACK_ENDIAN_LITTLE_BYTE 1)
34+
SET(MSGPACK_ENDIAN_LITTLE_BYTE 1)
3535
ENDIF ()
3636

3737
CONFIGURE_FILE (
@@ -115,20 +115,20 @@ ENDIF ()
115115
INCLUDE (Files.cmake)
116116

117117
CONFIGURE_FILE (
118-
msgpack.pc.in
119-
msgpack.pc
118+
msgpack-c.pc.in
119+
msgpack-c.pc
120120
@ONLY
121121
)
122122

123123
IF (MSGPACK_ENABLE_SHARED OR MSGPACK_ENABLE_STATIC)
124-
ADD_LIBRARY (msgpackc
125-
${msgpackc_SOURCES}
126-
${msgpackc_HEADERS}
124+
ADD_LIBRARY (msgpack-c
125+
${msgpack-c_SOURCES}
126+
${msgpack-c_HEADERS}
127127
)
128128

129-
SET_TARGET_PROPERTIES (msgpackc PROPERTIES SOVERSION 2 VERSION 2.0.0)
129+
SET_TARGET_PROPERTIES (msgpack-c PROPERTIES SOVERSION 2 VERSION 2.0.0)
130130

131-
TARGET_INCLUDE_DIRECTORIES (msgpackc
131+
TARGET_INCLUDE_DIRECTORIES (msgpack-c
132132
PUBLIC
133133
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
134134
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
@@ -141,12 +141,12 @@ ENDIF ()
141141

142142

143143
IF (MSGPACK_ENABLE_SHARED AND MSGPACK_ENABLE_STATIC)
144-
ADD_LIBRARY (msgpackc-static STATIC
145-
${msgpackc_SOURCES}
146-
${msgpackc_HEADERS}
144+
ADD_LIBRARY (msgpack-c-static STATIC
145+
${msgpack-c_SOURCES}
146+
${msgpack-c_HEADERS}
147147
)
148148

149-
TARGET_INCLUDE_DIRECTORIES (msgpackc-static
149+
TARGET_INCLUDE_DIRECTORIES (msgpack-c-static
150150
PUBLIC
151151
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
152152
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
@@ -156,13 +156,13 @@ IF (MSGPACK_ENABLE_SHARED AND MSGPACK_ENABLE_STATIC)
156156
${CMAKE_CURRENT_SOURCE_DIR}
157157
)
158158

159-
SET_TARGET_PROPERTIES (msgpackc-static PROPERTIES OUTPUT_NAME "msgpackc")
159+
SET_TARGET_PROPERTIES (msgpack-c-static PROPERTIES OUTPUT_NAME "msgpack-c")
160160

161161
IF (MSGPACK_ENABLE_SHARED)
162162
IF (MSVC)
163-
SET_TARGET_PROPERTIES (msgpackc PROPERTIES IMPORT_SUFFIX "_import.lib")
163+
SET_TARGET_PROPERTIES (msgpack-c PROPERTIES IMPORT_SUFFIX "_import.lib")
164164
ELSEIF (MINGW)
165-
SET_TARGET_PROPERTIES (msgpackc PROPERTIES IMPORT_SUFFIX ".dll.a")
165+
SET_TARGET_PROPERTIES (msgpack-c PROPERTIES IMPORT_SUFFIX ".dll.a")
166166
ENDIF ()
167167
ENDIF ()
168168
ENDIF ()
@@ -194,19 +194,19 @@ ENDIF ()
194194

195195
IF ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
196196
IF (MSGPACK_ENABLE_SHARED OR MSGPACK_ENABLE_STATIC)
197-
SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra -DPIC")
197+
SET_PROPERTY (TARGET msgpack-c APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra -DPIC")
198198
ENDIF ()
199199
IF (MSGPACK_ENABLE_SHARED AND MSGPACK_ENABLE_STATIC)
200-
SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra" )
200+
SET_PROPERTY (TARGET msgpack-c-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra" )
201201
ENDIF ()
202202
ENDIF ()
203203

204204
IF ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
205205
IF (MSGPACK_ENABLE_SHARED OR MSGPACK_ENABLE_STATIC)
206-
SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
206+
SET_PROPERTY (TARGET msgpack-c APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
207207
ENDIF ()
208208
IF (MSGPACK_ENABLE_SHARED AND MSGPACK_ENABLE_STATIC)
209-
SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
209+
SET_PROPERTY (TARGET msgpack-c-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
210210
ENDIF ()
211211
ENDIF ()
212212

@@ -227,7 +227,7 @@ IF ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC")
227227
ENDIF ()
228228

229229
IF ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC90" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC10")
230-
SET_SOURCE_FILES_PROPERTIES(${msgpackc_SOURCES} PROPERTIES LANGUAGE C)
230+
SET_SOURCE_FILES_PROPERTIES(${msgpack-c_SOURCES} PROPERTIES LANGUAGE C)
231231
ENDIF ()
232232

233233
IF ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "sparc")
@@ -247,28 +247,28 @@ IF (MSGPACK_BUILD_EXAMPLES)
247247
ENDIF ()
248248

249249
IF (MSGPACK_ENABLE_SHARED OR MSGPACK_ENABLE_STATIC)
250-
SET (MSGPACK_INSTALLTARGETS msgpackc)
250+
SET (MSGPACK_INSTALLTARGETS msgpack-c)
251251
ENDIF ()
252252

253253
IF (MSGPACK_ENABLE_SHARED AND MSGPACK_ENABLE_STATIC)
254-
LIST (APPEND MSGPACK_INSTALLTARGETS msgpackc-static)
254+
LIST (APPEND MSGPACK_INSTALLTARGETS msgpack-c-static)
255255
ENDIF ()
256256

257-
INSTALL (TARGETS ${MSGPACK_INSTALLTARGETS} EXPORT msgpackc-targets
257+
INSTALL (TARGETS ${MSGPACK_INSTALLTARGETS} EXPORT msgpack-c-targets
258258
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
259259
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
260260
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
261261
)
262-
FOREACH (file ${msgpackc_common_HEADERS})
262+
FOREACH (file ${msgpack-c_common_HEADERS})
263263
GET_FILENAME_COMPONENT (dir ${file} PATH)
264264
INSTALL (FILES ${file} DESTINATION ${CMAKE_INSTALL_PREFIX}/${dir})
265265
ENDFOREACH ()
266-
FOREACH (file ${msgpackc_configured_HEADERS})
266+
FOREACH (file ${msgpack-c_configured_HEADERS})
267267
GET_FILENAME_COMPONENT (dir ${file} PATH)
268268
INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/${file} DESTINATION ${CMAKE_INSTALL_PREFIX}/${dir})
269269
ENDFOREACH ()
270270
IF (NOT MSVC)
271-
INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/msgpack.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
271+
INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/msgpack-c.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
272272
ENDIF ()
273273

274274
# Doxygen
@@ -298,36 +298,36 @@ ENDIF ()
298298

299299
INCLUDE (CMakePackageConfigHelpers)
300300

301-
SET (CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/msgpackc")
301+
SET (CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/msgpack-c")
302302

303303
WRITE_BASIC_PACKAGE_VERSION_FILE (
304-
msgpackc-config-version.cmake
304+
msgpack-c-config-version.cmake
305305
VERSION ${VERSION}
306306
COMPATIBILITY SameMajorVersion
307307
)
308308

309309
IF (NOT CMAKE_VERSION VERSION_LESS 3.0)
310-
EXPORT (EXPORT msgpackc-targets
311-
FILE "${CMAKE_CURRENT_BINARY_DIR}/msgpackc-targets.cmake"
310+
EXPORT (EXPORT msgpack-c-targets
311+
FILE "${CMAKE_CURRENT_BINARY_DIR}/msgpack-c-targets.cmake"
312312
)
313313
ENDIF ()
314314

315-
CONFIGURE_PACKAGE_CONFIG_FILE (msgpackc-config.cmake.in
316-
msgpackc-config.cmake
315+
CONFIGURE_PACKAGE_CONFIG_FILE (msgpack-c-config.cmake.in
316+
msgpack-c-config.cmake
317317
INSTALL_DESTINATION "${CMAKE_INSTALL_CMAKEDIR}"
318318
)
319319

320-
INSTALL (EXPORT msgpackc-targets
320+
INSTALL (EXPORT msgpack-c-targets
321321
FILE
322-
msgpackc-targets.cmake
322+
msgpack-c-targets.cmake
323323
DESTINATION
324324
"${CMAKE_INSTALL_CMAKEDIR}"
325325
)
326326

327327
INSTALL (
328328
FILES
329-
"${CMAKE_CURRENT_BINARY_DIR}/msgpackc-config.cmake"
330-
"${CMAKE_CURRENT_BINARY_DIR}/msgpackc-config-version.cmake"
329+
"${CMAKE_CURRENT_BINARY_DIR}/msgpack-c-config.cmake"
330+
"${CMAKE_CURRENT_BINARY_DIR}/msgpack-c-config-version.cmake"
331331
DESTINATION
332332
"${CMAKE_INSTALL_CMAKEDIR}"
333333
)

‎Files.cmake‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Source files
2-
SET (msgpackc_SOURCES
2+
SET (msgpack-c_SOURCES
33
src/objectc.c
44
src/unpack.c
55
src/version.c
@@ -8,7 +8,7 @@ SET (msgpackc_SOURCES
88
)
99

1010
# Header files
11-
SET (msgpackc_common_HEADERS
11+
SET (msgpack-c_common_HEADERS
1212
include/msgpack.h
1313
include/msgpack/fbuffer.h
1414
include/msgpack/gcc_atomic.h
@@ -29,13 +29,13 @@ SET (msgpackc_common_HEADERS
2929
)
3030

3131
# Header files will configured
32-
SET (msgpackc_configured_HEADERS
32+
SET (msgpack-c_configured_HEADERS
3333
include/msgpack/pack_template.h
3434
include/msgpack/sysdep.h
3535
)
3636

3737
# All header files
38-
LIST (APPEND msgpackc_HEADERS
39-
${msgpackc_common_HEADERS}
40-
${msgpackc_configured_HEADERS}
38+
LIST (APPEND msgpack-c_HEADERS
39+
${msgpack-c_common_HEADERS}
40+
${msgpack-c_configured_HEADERS}
4141
)

‎QUICKSTART-C.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ int main(void) {
183183
}
184184

185185
/* results:
186-
* $ gcc stream.cc -lmsgpackc -o stream
186+
* $ gcc stream.cc -lmsgpack-c -o stream
187187
* $ ./stream
188188
* 1
189189
* 2

‎README.md‎

Lines changed: 1 addition & 1 deletion
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=c_master)](https://github.com/msgpack/msgpack-c/actions) [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch/c_master?svg=true)](https://ci.appveyor.com/project/redboltz/msgpack-c/branch/c_master)
4+
Version 6.0.0 [![Build Status](https://github.com/msgpack/msgpack-c/workflows/CI/badge.svg?branch=c_master)](https://github.com/msgpack/msgpack-c/actions) [![Build status](https://ci.appveyor.com/api/projects/status/8kstcgt79qj123mw/branch/c_master?svg=true)](https://ci.appveyor.com/project/redboltz/msgpack-c/branch/c_master)
55
[![codecov](https://codecov.io/gh/msgpack/msgpack-c/branch/c_master/graph/badge.svg)](https://codecov.io/gh/msgpack/msgpack-c/branch/c_master)
66

77
It's like JSON but smaller and faster.

‎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/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ FOREACH (source_file ${exec_PROGRAMS})
1919
${source_file}
2020
)
2121
TARGET_LINK_LIBRARIES (${source_file_we}
22-
msgpackc
22+
msgpack-c
2323
)
2424
IF ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
2525
SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra")

‎example/cmake/CMakeLists.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ project (example)
33

44
if(EXAMPLE_MSGPACK_EMBEDDED)
55
add_subdirectory(msgpack-c)
6-
set(msgpackc_DIR ${CMAKE_CURRENT_BINARY_DIR}/msgpack-c)
6+
set(msgpack-c_DIR ${CMAKE_CURRENT_BINARY_DIR}/msgpack-c)
77
endif()
88

9-
find_package(msgpackc REQUIRED)
9+
find_package(msgpack-c REQUIRED)
1010

1111
add_executable (${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/../simple_c.c)
12-
target_link_libraries(${PROJECT_NAME} msgpackc)
12+
target_link_libraries(${PROJECT_NAME} msgpack-c)
1313

14-
if(TARGET msgpackc-static)
14+
if(TARGET msgpack-c-static)
1515
add_executable (${PROJECT_NAME}-static ${CMAKE_CURRENT_LIST_DIR}/../simple_c.c)
16-
target_link_libraries(${PROJECT_NAME}-static msgpackc-static)
16+
target_link_libraries(${PROJECT_NAME}-static msgpack-c-static)
1717
endif()

‎include/msgpack/version_master.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
#define MSGPACK_VERSION_MAJOR 5
1+
#define MSGPACK_VERSION_MAJOR 6
22
#define MSGPACK_VERSION_MINOR 0
33
#define MSGPACK_VERSION_REVISION 0

0 commit comments

Comments
 (0)