blob: e1ed2c2038a5e13bbfd474e8f3dfd1bc5a51317f (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,27 +82,6 @@
OPTION (MSGPACK_GEN_COVERAGE "Enable running gcov to get a test coverage report." OFF)
ENDIF ()
-IF (DEFINED BUILD_SHARED_LIBS)
- IF (BUILD_SHARED_LIBS)
- IF (DEFINED MSGPACK_ENABLE_SHARED AND NOT MSGPACK_ENABLE_SHARED)
- MESSAGE(WARNING "MSGPACK_ENABLE_SHARED is overridden to ON by BUILD_SHARED_LIBS")
- ENDIF ()
- SET (MSGPACK_ENABLE_SHARED ON)
- IF (DEFINED MSGPACK_ENABLE_STATIC AND MSGPACK_ENABLE_STATIC)
- MESSAGE(WARNING "MSGPACK_ENABLE_STATIC is overridden to OFF by BUILD_SHARED_LIBS")
- ENDIF ()
- SET (MSGPACK_ENABLE_STATIC OFF)
- ELSE ()
- IF (DEFINED MSGPACK_ENABLE_SHARED AND MSGPACK_ENABLE_SHARED)
- MESSAGE(WARNING "MSGPACK_ENABLE_SHARED is overridden to OFF by BUILD_SHARED_LIBS")
- ENDIF ()
- SET (MSGPACK_ENABLE_SHARED OFF)
- IF (DEFINED MSGPACK_ENABLE_STATIC AND NOT MSGPACK_ENABLE_STATIC)
- MESSAGE(WARNING "MSGPACK_ENABLE_STATIC is overridden to ON by BUILD_SHARED_LIBS")
- ENDIF ()
- SET (MSGPACK_ENABLE_STATIC ON)
- ENDIF ()
-ELSE ()
IF (NOT DEFINED MSGPACK_ENABLE_SHARED)
SET (MSGPACK_ENABLE_SHARED ON)
ENDIF ()
@@ -110,7 +89,6 @@
SET (MSGPACK_ENABLE_STATIC ON)
ENDIF ()
SET (BUILD_SHARED_LIBS ${MSGPACK_ENABLE_SHARED})
-ENDIF ()
INCLUDE (Files.cmake)
|
GitWeb
