From 27639ce57823a9dcdfec1602fb4cc55b361f42e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Mon, 1 Dec 2014 23:47:21 +0100 Subject: [PATCH] Add support for BUILD_SHARED_LIBS argument BUILD_SHARED_LIBS is a standard CMake argument that serves the purpose of the custom JSONCPP_LIB_BUILD_SHARED. For now we force JSONCPP_LIB_BUILD_SHARED to true if BUILD_SHARED_LIBS was defined. Workaround for #51. --- src/lib_json/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/lib_json/CMakeLists.txt b/src/lib_json/CMakeLists.txt index 418044d..e126d30 100644 --- a/src/lib_json/CMakeLists.txt +++ b/src/lib_json/CMakeLists.txt @@ -1,4 +1,8 @@ OPTION(JSONCPP_LIB_BUILD_SHARED "Build jsoncpp_lib as a shared library." OFF) +IF(BUILD_SHARED_LIBS) + SET(JSONCPP_LIB_BUILD_SHARED ON) +ENDIF(BUILD_SHARED_LIBS) + IF(JSONCPP_LIB_BUILD_SHARED) SET(JSONCPP_LIB_TYPE SHARED) ADD_DEFINITIONS( -DJSON_DLL_BUILD )