Merge branch 'makiolo-master'

Author: redboltz

CMakeLists.txt

@@ -89,8 +89,10 @@ LIST (APPEND msgpack_HEADERS
     include/msgpack/util.h
     include/msgpack/sysdep.h
     include/msgpack/gcc_atomic.h
+    include/msgpack.h
     include/msgpack/sbuffer.h
     include/msgpack/version.h
+    include/msgpack/version_master.h
     include/msgpack/vrefbuffer.h
     include/msgpack/zbuffer.h
     include/msgpack/fbuffer.h
@@ -226,7 +228,9 @@ ENDIF ()
 
 INSTALL (TARGETS msgpack msgpack-static DESTINATION ${CMAKE_INSTALL_LIBDIR})
 INSTALL (DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX})
-INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/msgpack.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+IF (NOT MSVC)
+    INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/msgpack.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ENDIF ()
 
 # Doxygen
 FIND_PACKAGE (Doxygen)