From 1ab7a0bea72415f2e29a4b4317b183747e85a1b3 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Sat, 8 Nov 2014 20:43:26 -0500 Subject: [PATCH] json_spirit: Support shared builds Signed-off-by: Timothy Gu --- src/json_spirit-1-libs-crlf.patch | 42 +++++++++++++++++++++++++++++++ src/json_spirit.mk | 14 +---------- 2 files changed, 43 insertions(+), 13 deletions(-) create mode 100644 src/json_spirit-1-libs-crlf.patch diff --git a/src/json_spirit-1-libs-crlf.patch b/src/json_spirit-1-libs-crlf.patch new file mode 100644 index 00000000..e5444fc1 --- /dev/null +++ b/src/json_spirit-1-libs-crlf.patch @@ -0,0 +1,42 @@ +From 1351ac4833d49f49250c9f1e386b97a92b40c9fa Mon Sep 17 00:00:00 2001 +From: Timothy Gu +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 + +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 + diff --git a/src/json_spirit.mk b/src/json_spirit.mk index ab54d55a..92baaed0 100644 --- a/src/json_spirit.mk +++ b/src/json_spirit.mk @@ -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 =