json_spirit: Support shared builds

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
pull/556/head
Timothy Gu 10 years ago
parent 60a849f162
commit 1ab7a0bea7

@ -0,0 +1,42 @@
From 1351ac4833d49f49250c9f1e386b97a92b40c9fa Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Sat, 8 Nov 2014 20:02:08 -0500
Subject: [PATCH] Use BUILD_SHARED_LIBS to determine the type of library to be
built
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b9ef30..2a54cc8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,9 +18,4 @@ INSTALL(
${CMAKE_SOURCE_DIR}/json_spirit/json_spirit_writer_options.h
DESTINATION include)
-INSTALL(
- FILES
- ${CMAKE_BINARY_DIR}/json_spirit/libjson_spirit.a
- DESTINATION lib)
-
INCLUDE(CPack)
diff --git a/json_spirit/CMakeLists.txt b/json_spirit/CMakeLists.txt
index 04330f5..9b54790 100644
--- a/json_spirit/CMakeLists.txt
+++ b/json_spirit/CMakeLists.txt
@@ -13,5 +13,11 @@ json_spirit_writer_template.h )
FIND_PACKAGE(Boost 1.34 REQUIRED)
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR})
-ADD_LIBRARY(json_spirit STATIC ${JSON_SPIRIT_SRCS})
+ADD_LIBRARY(json_spirit ${JSON_SPIRIT_SRCS})
+
+INSTALL(
+ TARGETS json_spirit
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib)
--
1.9.1

@ -33,19 +33,7 @@ define $(PKG)_BUILD
-DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_RELEASE_POSTFIX='' \
-DBoost_THREADAPI=win32 \
-DBUILD_TESTS=OFF \
-DBUILD_apps=OFF \
-DBUILD_examples=OFF \
-DBUILD_global_tests=OFF \
-DBUILD_tools=OFF \
-DHAVE_MM_MALLOC_EXITCODE=0 \
-DHAVE_SSE4_1_EXTENSIONS_EXITCODE=0 \
-DHAVE_SSE3_EXTENSIONS_EXITCODE=0 \
-DHAVE_SSE2_EXTENSIONS_EXITCODE=0 \
-DHAVE_SSE_EXTENSIONS_EXITCODE=0
-DBoost_THREADAPI=win32
$(MAKE) -C '$(1).build' -j '$(JOBS)' VERBOSE=1 || $(MAKE) -C '$(1)' -j 1 VERBOSE=1
$(MAKE) -C '$(1).build' -j 1 install VERBOSE=1
endef
$(PKG)_BUILD_SHARED =

Loading…
Cancel
Save