From f5db5eede556b6c2c95ef539ea951f559b88013c Mon Sep 17 00:00:00 2001 From: c0ffeeartc Date: Wed, 3 Jun 2015 01:10:17 +0300 Subject: [PATCH 1/3] Update CMakeLists.txt --- unzip/CMakeLists.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/unzip/CMakeLists.txt b/unzip/CMakeLists.txt index fb620e74b4..52df4cdb39 100644 --- a/unzip/CMakeLists.txt +++ b/unzip/CMakeLists.txt @@ -4,7 +4,13 @@ set(UNZIP_SRC ioapi_mem.cpp ) -add_library(unzip STATIC +if(BUILD_SHARED_LIBS) + set (SHARED_OR_STATIC SHARED) +else() + set (SHARED_OR_STATIC STATIC) +endif() + +add_library(unzip ${SHARED_OR_STATIC} ${UNZIP_SRC} ) From c73ab94c7e31c69f2c344c7cc8e0c682c7fff0e4 Mon Sep 17 00:00:00 2001 From: c0ffeeartc Date: Wed, 3 Jun 2015 01:12:31 +0300 Subject: [PATCH 2/3] Update CMakeLists.txt --- flatbuffers/CMakeLists.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/flatbuffers/CMakeLists.txt b/flatbuffers/CMakeLists.txt index 6b87c6fecc..e3a0225c60 100644 --- a/flatbuffers/CMakeLists.txt +++ b/flatbuffers/CMakeLists.txt @@ -14,7 +14,13 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ) -add_library(flatbuffers STATIC +if(BUILD_SHARED_LIBS) + set (SHARED_OR_STATIC SHARED) +else() + set (SHARED_OR_STATIC STATIC) +endif() + +add_library(flatbuffers ${SHARED_OR_STATIC} ${FLATBUFFERS_SRC} ) From 1c134e9c6cbeb80dc2f67769ea23e8d3e4b7bf2b Mon Sep 17 00:00:00 2001 From: c0ffeeartc Date: Wed, 3 Jun 2015 01:15:36 +0300 Subject: [PATCH 3/3] Update CMakeLists.txt --- xxhash/CMakeLists.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/xxhash/CMakeLists.txt b/xxhash/CMakeLists.txt index 18f6cada0a..1a77e99b99 100644 --- a/xxhash/CMakeLists.txt +++ b/xxhash/CMakeLists.txt @@ -2,7 +2,13 @@ set(XXHASH xxhash.c ) -add_library(xxhash STATIC +if(BUILD_SHARED_LIBS) + set (SHARED_OR_STATIC SHARED) +else() + set (SHARED_OR_STATIC STATIC) +endif() + +add_library(xxhash ${SHARED_OR_STATIC} ${XXHASH} )