Skip to content

Commit d437961

Browse files
makioloredboltz
authored andcommitted
* Changes for compile msgpack with Visual Studio 2012
1 parent f1679a1 commit d437961

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

CMakeLists.txt

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,10 @@ LIST (APPEND msgpack_HEADERS
8989
include/msgpack/util.h
9090
include/msgpack/sysdep.h
9191
include/msgpack/gcc_atomic.h
92+
include/msgpack.h
9293
include/msgpack/sbuffer.h
9394
include/msgpack/version.h
95+
include/msgpack/version_master.h
9496
include/msgpack/vrefbuffer.h
9597
include/msgpack/zbuffer.h
9698
include/msgpack/fbuffer.h
@@ -181,6 +183,10 @@ INCLUDE_DIRECTORIES (
181183
${MSGPACK_BOOST_DIR}
182184
)
183185

186+
IF(MSVC)
187+
SET_SOURCE_FILES_PROPERTIES(src/unpack.c src/objectc.c src/version.c src/vrefbuffer.c src/zone.c PROPERTIES LANGUAGE CXX )
188+
ENDIF()
189+
184190
ADD_LIBRARY (msgpack SHARED
185191
${msgpack_SOURCES}
186192
${msgpack_HEADERS}
@@ -226,7 +232,10 @@ ENDIF ()
226232

227233
INSTALL (TARGETS msgpack msgpack-static DESTINATION ${CMAKE_INSTALL_LIBDIR})
228234
INSTALL (DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX})
229-
INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/msgpack.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
235+
IF (NOT MSVC)
236+
INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/msgpack.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
237+
INSTALL (FILES msgpack.pc DESTINATION lib/pkgconfig)
238+
ENDIF ()
230239

231240
# Doxygen
232241
FIND_PACKAGE (Doxygen)

0 commit comments

Comments
 (0)