Merge pull request #1053 from redboltz/unify_project_name_c

Unify all package related names to msgpack-c.

.github/workflows/gha.yml

@@ -31,10 +31,12 @@ jobs:
         export ARCH="64"
         if [ ${{ matrix.pattern }} == 0 ]; then
           export SHARED="ON"
+          export SAN="-fsanitize=address -fno-omit-frame-pointer"
           export CHAR_SIGN="unsigned"
         fi
         if [ ${{ matrix.pattern }} == 1 ]; then
           export SHARED="ON"
+          export SAN="-fsanitize=address -fno-omit-frame-pointer"
           export CHAR_SIGN="signed"
         fi
         if [ ${{ matrix.pattern }} == 2 ]; then
@@ -61,7 +63,7 @@ jobs:
         cd ..
 
         # build and test
-        CMAKE_CXX_COMPILER="${CXX}" CMAKE_C_COMPILER="${CC}" GTEST_ROOT="${BASE}/usr" CFLAGS="-Werror -g -fsanitize=undefined" CXXFLAGS="-Werror -g -fsanitize=undefined" ${ACTION}
+        CMAKE_CXX_COMPILER="${CXX}" CMAKE_C_COMPILER="${CC}" GTEST_ROOT="${BASE}/usr" CFLAGS="-Werror -g -fsanitize=undefined  -fno-sanitize-recover=all" CXXFLAGS="-Werror -g -ggdb3 -fsanitize=undefined  -fno-sanitize-recover=all" ${ACTION}
 
   linux:
     runs-on: ubuntu-18.04
@@ -87,6 +89,7 @@ jobs:
           ACTION="ci/build_cmake.sh"
           export ARCH="64"
           export SHARED="ON"
+          export SAN="-fsanitize=address -fno-omit-frame-pointer"
           export CHAR_SIGN="unsigned"
         fi
         if [ ${{ matrix.pattern }} == 1 ]; then
@@ -95,6 +98,7 @@ jobs:
           ACTION="ci/build_cmake.sh"
           export ARCH="32"
           export SHARED="ON"
+          export SAN="-fsanitize=address -fno-omit-frame-pointer"
           export CHAR_SIGN="signed"
         fi
         if [ ${{ matrix.pattern }} == 2 ]; then
@@ -103,6 +107,7 @@ jobs:
           ACTION="ci/build_cmake.sh"
           export ARCH="64"
           export SHARED="ON"
+          export SAN="-fsanitize=address -fno-omit-frame-pointer"
           export CHAR_SIGN="signed"
         fi
         if [ ${{ matrix.pattern }} == 3 ]; then
@@ -119,6 +124,7 @@ jobs:
           ACTION="ci/build_cmake.sh"
           export ARCH="64"
           export SHARED="ON"
+          export SAN="-fsanitize=address -fno-omit-frame-pointer"
           export CHAR_SIGN="signed"
         fi
         if [ ${{ matrix.pattern }} == 5 ]; then
@@ -127,6 +133,7 @@ jobs:
           ACTION="ci/build_cmake.sh"
           export ARCH="32"
           export SHARED="ON"
+          export SAN="-fsanitize=address -fno-omit-frame-pointer"
           export CHAR_SIGN="unsigned"
         fi
         if [ ${{ matrix.pattern }} == 6 ]; then
@@ -135,6 +142,7 @@ jobs:
           ACTION="ci/build_cmake.sh"
           export ARCH="64"
           export SHARED="ON"
+          export SAN="-fsanitize=address -fno-omit-frame-pointer"
           export CHAR_SIGN="unsigned"
         fi
         if [ ${{ matrix.pattern }} == 7 ]; then
@@ -172,7 +180,7 @@ jobs:
         fi
 
         # build and test
-        CMAKE_CXX_COMPILER="${CXX}" CMAKE_C_COMPILER="${CC}" GTEST_ROOT="${BASE}/usr" CFLAGS="-Werror -g -fsanitize=undefined" CXXFLAGS="-Werror -g -fsanitize=undefined" MSGPACK_SAN="${SAN}" ${ACTION}
+        CMAKE_CXX_COMPILER="${CXX}" CMAKE_C_COMPILER="${CC}" GTEST_ROOT="${BASE}/usr" CFLAGS="-Werror -g -fsanitize=undefined  -fno-sanitize-recover=all" CXXFLAGS="-Werror -g -ggdb3 -fsanitize=undefined  -fno-sanitize-recover=all" ${ACTION}
 
   windows:
     runs-on: windows-2019

.gitignore

@@ -19,7 +19,7 @@ Makefile.in
 /config.log
 /config.status
 /libtool
-/msgpack.pc
+/msgpack-c.pc
 /src/msgpack/version.h
 /src/msgpack/version.hpp
 /stamp-h1

CHANGELOG.md

@@ -1,3 +1,13 @@
+# 2023-02-28 version 6.0.0
+## << breaking changes >>
+  * Change CMake package name of C library to msgpack-c (#1053)
+    Unified all C package, library, cmake, tarball name become msgpack-c.
+
+# 2023-01-10 version 5.0.0
+  * Add additional address sanitizer for CI. (#1023)
+## << breaking changes >>
+  * Change CMake package name of C library to msgpackc (#1044, #1049)
+
 # 2021-08-01 version 4.0.0
   * Fix and improve alignment logic (#962)
   * Fix iovec name conflict (#953)

CMakeLists.txt

@@ -5,7 +5,7 @@ IF ((CMAKE_VERSION VERSION_GREATER 3.1) OR
     CMAKE_POLICY(SET CMP0054 NEW)
 ENDIF ()
 
-PROJECT (msgpack)
+PROJECT (msgpack-c)
 
 FILE (READ ${CMAKE_CURRENT_SOURCE_DIR}/include/msgpack/version_master.h contents)
 STRING (REGEX MATCH "#define MSGPACK_VERSION_MAJOR *([0-9a-zA-Z_]*)" NULL_OUT ${contents})
@@ -31,7 +31,7 @@ IF (BIGENDIAN)
     SET(MSGPACK_ENDIAN_LITTLE_BYTE 0)
 ELSE ()
     SET(MSGPACK_ENDIAN_BIG_BYTE 0)
-	SET(MSGPACK_ENDIAN_LITTLE_BYTE 1)
+        SET(MSGPACK_ENDIAN_LITTLE_BYTE 1)
 ENDIF ()
 
 CONFIGURE_FILE (
@@ -115,20 +115,20 @@ ENDIF ()
 INCLUDE (Files.cmake)
 
 CONFIGURE_FILE (
-    msgpack.pc.in
-    msgpack.pc
+    msgpack-c.pc.in
+    msgpack-c.pc
     @ONLY
 )
 
 IF (MSGPACK_ENABLE_SHARED OR MSGPACK_ENABLE_STATIC)
-    ADD_LIBRARY (msgpackc
-        ${msgpackc_SOURCES}
-        ${msgpackc_HEADERS}
+    ADD_LIBRARY (msgpack-c
+        ${msgpack-c_SOURCES}
+        ${msgpack-c_HEADERS}
     )
 
-    SET_TARGET_PROPERTIES (msgpackc PROPERTIES SOVERSION 2 VERSION 2.0.0)
+    SET_TARGET_PROPERTIES (msgpack-c PROPERTIES SOVERSION 2 VERSION 2.0.0)
 
-    TARGET_INCLUDE_DIRECTORIES (msgpackc
+    TARGET_INCLUDE_DIRECTORIES (msgpack-c
         PUBLIC
             $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
             $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
@@ -141,12 +141,12 @@ ENDIF ()
 
 
 IF (MSGPACK_ENABLE_SHARED AND MSGPACK_ENABLE_STATIC)
-    ADD_LIBRARY (msgpackc-static STATIC
-        ${msgpackc_SOURCES}
-        ${msgpackc_HEADERS}
+    ADD_LIBRARY (msgpack-c-static STATIC
+        ${msgpack-c_SOURCES}
+        ${msgpack-c_HEADERS}
     )
 
-    TARGET_INCLUDE_DIRECTORIES (msgpackc-static
+    TARGET_INCLUDE_DIRECTORIES (msgpack-c-static
         PUBLIC
             $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
             $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
@@ -156,13 +156,13 @@ IF (MSGPACK_ENABLE_SHARED AND MSGPACK_ENABLE_STATIC)
             ${CMAKE_CURRENT_SOURCE_DIR}
     )
 
-    SET_TARGET_PROPERTIES (msgpackc-static PROPERTIES OUTPUT_NAME "msgpackc")
+    SET_TARGET_PROPERTIES (msgpack-c-static PROPERTIES OUTPUT_NAME "msgpack-c")
 
     IF (MSGPACK_ENABLE_SHARED)
         IF (MSVC)
-            SET_TARGET_PROPERTIES (msgpackc PROPERTIES IMPORT_SUFFIX "_import.lib")
+            SET_TARGET_PROPERTIES (msgpack-c PROPERTIES IMPORT_SUFFIX "_import.lib")
         ELSEIF (MINGW)
-            SET_TARGET_PROPERTIES (msgpackc PROPERTIES IMPORT_SUFFIX ".dll.a")
+            SET_TARGET_PROPERTIES (msgpack-c PROPERTIES IMPORT_SUFFIX ".dll.a")
         ENDIF ()
     ENDIF ()
 ENDIF ()
@@ -194,19 +194,19 @@ ENDIF ()
 
 IF ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
     IF (MSGPACK_ENABLE_SHARED OR MSGPACK_ENABLE_STATIC)
-        SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra -DPIC")
+        SET_PROPERTY (TARGET msgpack-c APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra -DPIC")
     ENDIF ()
     IF (MSGPACK_ENABLE_SHARED AND MSGPACK_ENABLE_STATIC)
-       SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra" )
+       SET_PROPERTY (TARGET msgpack-c-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra" )
     ENDIF ()
 ENDIF ()
 
 IF ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
     IF (MSGPACK_ENABLE_SHARED OR MSGPACK_ENABLE_STATIC)
-        SET_PROPERTY (TARGET msgpackc APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
+        SET_PROPERTY (TARGET msgpack-c APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
     ENDIF ()
     IF (MSGPACK_ENABLE_SHARED AND MSGPACK_ENABLE_STATIC)
-        SET_PROPERTY (TARGET msgpackc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
+        SET_PROPERTY (TARGET msgpack-c-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-mismatched-tags")
     ENDIF ()
 ENDIF ()
 
@@ -227,7 +227,7 @@ IF ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC")
 ENDIF ()
 
 IF ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC90" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC10")
-    SET_SOURCE_FILES_PROPERTIES(${msgpackc_SOURCES} PROPERTIES LANGUAGE C)
+    SET_SOURCE_FILES_PROPERTIES(${msgpack-c_SOURCES} PROPERTIES LANGUAGE C)
 ENDIF ()
 
 IF ("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "sparc")
@@ -247,28 +247,28 @@ IF (MSGPACK_BUILD_EXAMPLES)
 ENDIF ()
 
 IF (MSGPACK_ENABLE_SHARED OR MSGPACK_ENABLE_STATIC)
-    SET (MSGPACK_INSTALLTARGETS msgpackc)
+    SET (MSGPACK_INSTALLTARGETS msgpack-c)
 ENDIF ()
 
 IF (MSGPACK_ENABLE_SHARED AND MSGPACK_ENABLE_STATIC)
-    LIST (APPEND MSGPACK_INSTALLTARGETS msgpackc-static)
+    LIST (APPEND MSGPACK_INSTALLTARGETS msgpack-c-static)
 ENDIF ()
 
-INSTALL (TARGETS ${MSGPACK_INSTALLTARGETS} EXPORT msgpack-targets
+INSTALL (TARGETS ${MSGPACK_INSTALLTARGETS} EXPORT msgpack-c-targets
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
-FOREACH (file ${msgpackc_common_HEADERS})
+FOREACH (file ${msgpack-c_common_HEADERS})
     GET_FILENAME_COMPONENT (dir ${file} PATH)
     INSTALL (FILES ${file} DESTINATION ${CMAKE_INSTALL_PREFIX}/${dir})
 ENDFOREACH ()
-FOREACH (file ${msgpackc_configured_HEADERS})
+FOREACH (file ${msgpack-c_configured_HEADERS})
     GET_FILENAME_COMPONENT (dir ${file} PATH)
     INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/${file} DESTINATION ${CMAKE_INSTALL_PREFIX}/${dir})
 ENDFOREACH ()
 IF (NOT MSVC)
-    INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/msgpack.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+    INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/msgpack-c.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 ENDIF ()
 
 # Doxygen
@@ -298,36 +298,36 @@ ENDIF ()
 
 INCLUDE (CMakePackageConfigHelpers)
 
-SET (CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/msgpack")
+SET (CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/msgpack-c")
 
 WRITE_BASIC_PACKAGE_VERSION_FILE (
-    msgpack-config-version.cmake
+    msgpack-c-config-version.cmake
     VERSION ${VERSION}
     COMPATIBILITY SameMajorVersion
 )
 
 IF (NOT CMAKE_VERSION VERSION_LESS 3.0)
-    EXPORT (EXPORT msgpack-targets
-        FILE "${CMAKE_CURRENT_BINARY_DIR}/msgpack-targets.cmake"
+    EXPORT (EXPORT msgpack-c-targets
+        FILE "${CMAKE_CURRENT_BINARY_DIR}/msgpack-c-targets.cmake"
     )
 ENDIF ()
 
-CONFIGURE_PACKAGE_CONFIG_FILE (msgpack-config.cmake.in
-    msgpack-config.cmake
+CONFIGURE_PACKAGE_CONFIG_FILE (msgpack-c-config.cmake.in
+    msgpack-c-config.cmake
     INSTALL_DESTINATION "${CMAKE_INSTALL_CMAKEDIR}"
 )
 
-INSTALL (EXPORT msgpack-targets
+INSTALL (EXPORT msgpack-c-targets
     FILE
-        msgpack-targets.cmake
+        msgpack-c-targets.cmake
     DESTINATION
         "${CMAKE_INSTALL_CMAKEDIR}"
 )
 
 INSTALL (
     FILES
-        "${CMAKE_CURRENT_BINARY_DIR}/msgpack-config.cmake"
-        "${CMAKE_CURRENT_BINARY_DIR}/msgpack-config-version.cmake"
+        "${CMAKE_CURRENT_BINARY_DIR}/msgpack-c-config.cmake"
+        "${CMAKE_CURRENT_BINARY_DIR}/msgpack-c-config-version.cmake"
     DESTINATION
         "${CMAKE_INSTALL_CMAKEDIR}"
 )

Files.cmake

@@ -1,5 +1,5 @@
 # Source files
-SET (msgpackc_SOURCES
+SET (msgpack-c_SOURCES
     src/objectc.c
     src/unpack.c
     src/version.c
@@ -8,7 +8,7 @@ SET (msgpackc_SOURCES
 )
 
 # Header files
-SET (msgpackc_common_HEADERS
+SET (msgpack-c_common_HEADERS
     include/msgpack.h
     include/msgpack/fbuffer.h
     include/msgpack/gcc_atomic.h
@@ -29,13 +29,13 @@ SET (msgpackc_common_HEADERS
 )
 
 # Header files will configured
-SET (msgpackc_configured_HEADERS
+SET (msgpack-c_configured_HEADERS
     include/msgpack/pack_template.h
     include/msgpack/sysdep.h
 )
 
 # All header files
-LIST (APPEND msgpackc_HEADERS
-    ${msgpackc_common_HEADERS}
-    ${msgpackc_configured_HEADERS}
+LIST (APPEND msgpack-c_HEADERS
+    ${msgpack-c_common_HEADERS}
+    ${msgpack-c_configured_HEADERS}
 )

QUICKSTART-C.md

@@ -183,7 +183,7 @@ int main(void) {
         }
 
         /* results:
-         * $ gcc stream.cc -lmsgpackc -o stream
+         * $ gcc stream.cc -lmsgpack-c -o stream
          * $ ./stream
          * 1
          * 2

README.md

@@ -1,7 +1,7 @@
 `msgpack` for C
 ===================
 
-Version 4.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)
+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)
 [![codecov](https://codecov.io/gh/msgpack/msgpack-c/branch/c_master/graph/badge.svg)](https://codecov.io/gh/msgpack/msgpack-c/branch/c_master)
 
 It's like JSON but smaller and faster.

appveyor.yml

@@ -1,4 +1,4 @@
-version: 4.0.0.{build}
+version: 6.0.0.{build}
 
 branches:
   only:
@@ -22,10 +22,10 @@ build_script:
 - cmake --build . --config Release
 - cd ..
 - cd ..
-- appveyor DownloadFile http://zlib.net/zlib-1.2.11.tar.gz -FileName zlib-1.2.11.tar.gz
-- 7z x zlib-1.2.11.tar.gz > NUL
-- 7z x zlib-1.2.11.tar > NUL
-- cd zlib-1.2.11
+- appveyor DownloadFile http://zlib.net/zlib-1.2.13.tar.gz -FileName zlib-1.2.13.tar.gz
+- 7z x zlib-1.2.13.tar.gz > NUL
+- 7z x zlib-1.2.13.tar > NUL
+- cd zlib-1.2.13
 - md build
 - cd build
 - cmake -G %msvc% ..
@@ -35,9 +35,9 @@ build_script:
 - cd ..
 - md build
 - cd build
-- cmake -G %msvc% -DGTEST_LIBRARY=%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\build\Release\gtest.lib -DGTEST_MAIN_LIBRARY=%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\build\Release\gtest_main.lib -DGTEST_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\include -DZLIB_LIBRARY=%APPVEYOR_BUILD_FOLDER%\zlib-1.2.11\build\Release\zlib.lib -DZLIB_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\zlib-1.2.11 -DCMAKE_CXX_FLAGS='"/D_VARIADIC_MAX=10 /EHsc"' ..
+- cmake -G %msvc% -DGTEST_LIBRARY=%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\build\Release\gtest.lib -DGTEST_MAIN_LIBRARY=%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\build\Release\gtest_main.lib -DGTEST_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\include -DZLIB_LIBRARY=%APPVEYOR_BUILD_FOLDER%\zlib-1.2.13\build\Release\zlib.lib -DZLIB_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%\zlib-1.2.13 -DCMAKE_CXX_FLAGS='"/D_VARIADIC_MAX=10 /EHsc"' ..
 - cmake --build . --config Release -v
 
 test_script:
-- set PATH=%PATH%;%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\build\Release;%APPVEYOR_BUILD_FOLDER%\zlib-1.2.11\build\Release;%APPVEYOR_BUILD_FOLDER%\build\release
+- set PATH=%PATH%;%APPVEYOR_BUILD_FOLDER%\googletest-release-1.7.0\build\Release;%APPVEYOR_BUILD_FOLDER%\zlib-1.2.13\build\Release;%APPVEYOR_BUILD_FOLDER%\build\release
 - ctest -V

ci/build_cmake.sh

@@ -25,7 +25,7 @@ else
     export ARCH_FLAG="-m64"
 fi
 
-cmake -DMSGPACK_32BIT=${BIT32} -DBUILD_SHARED_LIBS=${SHARED} -DMSGPACK_CHAR_SIGN=${CHAR_SIGN} -DCMAKE_CXX_FLAGS="${ARCH_FLAG} ${CXXFLAGS}" -DCMAKE_C_FLAGS="${CFLAGS}" ..
+cmake -DMSGPACK_32BIT=${BIT32} -DBUILD_SHARED_LIBS=${SHARED} -DMSGPACK_CHAR_SIGN=${CHAR_SIGN} -DCMAKE_CXX_FLAGS="${ARCH_FLAG} ${CXXFLAGS} ${SAN}" -DCMAKE_C_FLAGS="${CFLAGS} ${SAN}" ..
 
 ret=$?
 if [ $ret -ne 0 ]
@@ -49,6 +49,7 @@ then
     exit $ret
 fi
 
+cmake -DMSGPACK_32BIT=${BIT32} -DBUILD_SHARED_LIBS=${SHARED} -DMSGPACK_CHAR_SIGN=${CHAR_SIGN} -DCMAKE_CXX_FLAGS="${ARCH_FLAG} ${CXXFLAGS}" -DCMAKE_C_FLAGS="${CFLAGS}" ..
 make install DESTDIR=`pwd`/install
 
 ret=$?

example/CMakeLists.txt

@@ -19,7 +19,7 @@ FOREACH (source_file ${exec_PROGRAMS})
         ${source_file}
     )
     TARGET_LINK_LIBRARIES (${source_file_we}
-        msgpackc
+        msgpack-c
     )
     IF ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
         SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS " -Wall -Wextra")

example/cmake/CMakeLists.txt

@@ -3,15 +3,15 @@ project (example)
 
 if(EXAMPLE_MSGPACK_EMBEDDED)
     add_subdirectory(msgpack-c)
-    set(msgpack_DIR ${CMAKE_CURRENT_BINARY_DIR}/msgpack-c)
+    set(msgpack-c_DIR ${CMAKE_CURRENT_BINARY_DIR}/msgpack-c)
 endif()
 
-find_package(msgpack REQUIRED)
+find_package(msgpack-c REQUIRED)
 
 add_executable (${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/../simple_c.c)
-target_link_libraries(${PROJECT_NAME} msgpackc)
+target_link_libraries(${PROJECT_NAME} msgpack-c)
 
-if(TARGET msgpackc-static)
+if(TARGET msgpack-c-static)
     add_executable (${PROJECT_NAME}-static ${CMAKE_CURRENT_LIST_DIR}/../simple_c.c)
-    target_link_libraries(${PROJECT_NAME}-static msgpackc-static)
+    target_link_libraries(${PROJECT_NAME}-static msgpack-c-static)
 endif()

include/msgpack/version_master.h

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

makedist.sh

@@ -24,7 +24,7 @@ tar --append --file=$filename $prefix/CMakeLists.txt
 tar --append --file=$filename $prefix/Files.cmake
 tar --append --file=$filename $prefix/NOTICE
 tar --append --file=$filename $prefix/Doxyfile
-tar --append --file=$filename $prefix/msgpack.pc.in
+tar --append --file=$filename $prefix/msgpack-c.pc.in
 tar --append --file=$filename $prefix/AUTHORS
 tar --append --file=$filename $prefix/README.md
 tar --append --file=$filename $prefix/LICENSE_1_0.txt
@@ -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/msgpack-config.cmake.in
+tar --append --file=$filename $prefix/msgpack-c-config.cmake.in
 
 rm -f $prefix
 

msgpack-c-config.cmake.in

@@ -0,0 +1,19 @@
+#.rst:
+# msgpack
+# -------
+#
+# The following import targets are created
+#
+# ::
+#
+#   msgpack-c
+#   msgpack-c-static (optional)
+#
+
+@PACKAGE_INIT@
+
+include(CMakeFindDependencyMacro)
+
+if(NOT TARGET msgpack-c AND NOT TARGET msgpack-c-static)
+  include("${CMAKE_CURRENT_LIST_DIR}/msgpack-c-targets.cmake")
+endif()

msgpack-c.pc.in

@@ -6,5 +6,5 @@ includedir=@includedir@
 Name: MessagePack
 Description: Binary-based efficient object serialization library
 Version: @VERSION@
-Libs: -L${libdir} -lmsgpackc
+Libs: -L${libdir} -lmsgpack-c
 Cflags: -I${includedir}

msgpack-config.cmake.in

@@ -1,19 +0,0 @@
-#.rst:
-# msgpack
-# -------
-#
-# The following import targets are created
-#
-# ::
-#
-#   msgpackc
-#   msgpackc-static (optional)
-#
-
-@PACKAGE_INIT@
-
-include(CMakeFindDependencyMacro)
-
-if(NOT TARGET msgpackc AND NOT TARGET msgpackc-static)
-  include("${CMAKE_CURRENT_LIST_DIR}/msgpack-targets.cmake")
-endif()

test/CMakeLists.txt

@@ -23,7 +23,7 @@ FOREACH (source_file ${check_PROGRAMS})
     )
 
     TARGET_LINK_LIBRARIES (${source_file_we}
-        msgpackc
+        msgpack-c
         ${GTEST_BOTH_LIBRARIES}
         ${ZLIB_LIBRARIES}
         ${CMAKE_THREAD_LIBS_INIT}