Skip to content

Commit c8fa0be

Browse files
committed
Supported make install.
Removed vc2008 files from make dist.
1 parent 643b0c9 commit c8fa0be

File tree

2 files changed

+30
-6
lines changed

2 files changed

+30
-6
lines changed

CMakeLists.txt

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,18 @@ LIST (APPEND msgpack_SOURCES
4848
src/zone.c
4949
)
5050

51-
LIST (APPEND msgpack_HEADERS
51+
LIST (APPEND msgpack_root_HEADERS
52+
src/msgpack.h
53+
)
54+
55+
LIST (APPEND msgpack_HEADERS ${msgpack_root_HEADERS})
56+
57+
LIST (APPEND msgpack_msgpack_HEADERS
5258
src/msgpack/pack_define.h
5359
src/msgpack/pack_template.h
5460
src/msgpack/unpack_define.h
5561
src/msgpack/unpack_template.h
5662
src/msgpack/sysdep.h
57-
src/msgpack.h
5863
src/msgpack/sbuffer.h
5964
src/msgpack/version.h
6065
src/msgpack/vrefbuffer.h
@@ -65,16 +70,26 @@ LIST (APPEND msgpack_HEADERS
6570
src/msgpack/zone.h
6671
)
6772

73+
LIST (APPEND msgpack_HEADERS ${msgpack_msgpack_HEADERS})
74+
6875
IF (MSGPACK_ENABLE_CXX)
69-
LIST (APPEND msgpack_HEADERS
76+
LIST (APPEND msgpack_root_HEADERS
7077
src/msgpack.hpp
78+
)
79+
LIST (APPEND msgpack_HEADERS ${msgpack_root_HEADERS})
80+
81+
LIST (APPEND msgpack_msgpack_HEADERS
7182
src/msgpack/sbuffer.hpp
7283
src/msgpack/vrefbuffer.hpp
7384
src/msgpack/zbuffer.hpp
7485
src/msgpack/pack.hpp
7586
src/msgpack/unpack.hpp
7687
src/msgpack/object.hpp
7788
src/msgpack/zone.hpp
89+
)
90+
LIST (APPEND msgpack_HEADERS ${msgpack_msgpack_HEADERS})
91+
92+
LIST (APPEND msgpack_type_HEADERS
7893
src/msgpack/type.hpp
7994
src/msgpack/type/bool.hpp
8095
src/msgpack/type/deque.hpp
@@ -91,9 +106,14 @@ IF (MSGPACK_ENABLE_CXX)
91106
src/msgpack/type/vector.hpp
92107
src/msgpack/type/tuple.hpp
93108
src/msgpack/type/define.hpp
109+
)
110+
LIST (APPEND msgpack_HEADERS ${msgpack_type_HEADERS})
111+
112+
LIST (APPEND msgpack_tr1_HEADERS
94113
src/msgpack/type/tr1/unordered_map.hpp
95114
src/msgpack/type/tr1/unordered_set.hpp
96115
)
116+
LIST (APPEND msgpack_HEADERS ${msgpack_tr1_HEADERS})
97117
ENDIF ()
98118

99119
IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
@@ -135,6 +155,12 @@ IF (MSGPACK_BUILD_TESTS)
135155
ADD_SUBDIRECTORY (test)
136156
ENDIF ()
137157

158+
INSTALL (TARGETS msgpack msgpack-static DESTINATION lib)
159+
INSTALL (FILES ${msgpack_root_HEADERS} DESTINATION include)
160+
INSTALL (FILES ${msgpack_msgpack_HEADERS} DESTINATION include/msgpack)
161+
INSTALL (FILES ${msgpack_type_HEADERS} DESTINATION include/msgpack/type)
162+
INSTALL (FILES ${msgpack_tr1_HEADERS} DESTINATION include/msgpack/type/tr1)
163+
138164
# Doxygen
139165
FIND_PACKAGE (Doxygen)
140166
IF (DOXYGEN_FOUND)

Makefile.am

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,10 @@ DOC_FILES = \
66
NOTICE \
77
msgpack_vc8.vcproj \
88
msgpack_vc8.sln \
9-
msgpack_vc2008.vcproj \
10-
msgpack_vc2008.sln \
119
msgpack_vc.postbuild.bat
1210

1311
EXTRA_DIST = \
14-
$(DOC_FILES)
12+
$(DOC_FILES) CMakeLists.txt test/CMakeLists.txt
1513

1614
pkgconfigdir = $(libdir)/pkgconfig
1715
pkgconfig_DATA = msgpack.pc

0 commit comments

Comments
 (0)