Skip to content

Commit 408b982

Browse files
committed
Use standard CMake variables - static/shared lib.
Replace JSONCPP_LIB_BUILD_SHARED => BUILD_SHARED_LIBS Replace JSONCPP_LIB_BUILD_STATIC => BUILD_STATIC_LIBS Removed workaround open-source-parsers#51 Removed OPTION for shared/static in this file.
1 parent 74143f3 commit 408b982

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

src/lib_json/CMakeLists.txt

+2-9
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
OPTION(JSONCPP_LIB_BUILD_SHARED "Build jsoncpp_lib as a shared library." OFF)
2-
OPTION(JSONCPP_LIB_BUILD_STATIC "Build jsoncpp_lib static library." ON)
3-
4-
IF(BUILD_SHARED_LIBS)
5-
SET(JSONCPP_LIB_BUILD_SHARED ON)
6-
ENDIF(BUILD_SHARED_LIBS)
7-
81
if( CMAKE_COMPILER_IS_GNUCXX )
92
#Get compiler version.
103
execute_process( COMMAND ${CMAKE_CXX_COMPILER} -dumpversion
@@ -46,7 +39,7 @@ ELSE(JSONCPP_WITH_CMAKE_PACKAGE)
4639
SET(INSTALL_EXPORT)
4740
ENDIF(JSONCPP_WITH_CMAKE_PACKAGE)
4841

49-
IF(JSONCPP_LIB_BUILD_SHARED)
42+
IF(BUILD_SHARED_LIBS)
5043
ADD_DEFINITIONS( -DJSON_DLL_BUILD )
5144
ADD_LIBRARY(jsoncpp_lib SHARED ${PUBLIC_HEADERS} ${jsoncpp_sources})
5245
SET_TARGET_PROPERTIES( jsoncpp_lib PROPERTIES VERSION ${JSONCPP_VERSION} SOVERSION ${JSONCPP_VERSION_MAJOR})
@@ -65,7 +58,7 @@ IF(JSONCPP_LIB_BUILD_SHARED)
6558

6659
ENDIF()
6760

68-
IF(JSONCPP_LIB_BUILD_STATIC)
61+
IF(BUILD_STATIC_LIBS)
6962
ADD_LIBRARY(jsoncpp_lib_static STATIC ${PUBLIC_HEADERS} ${jsoncpp_sources})
7063
SET_TARGET_PROPERTIES( jsoncpp_lib_static PROPERTIES VERSION ${JSONCPP_VERSION} SOVERSION ${JSONCPP_VERSION_MAJOR})
7164
SET_TARGET_PROPERTIES( jsoncpp_lib_static PROPERTIES OUTPUT_NAME jsoncpp )

0 commit comments

Comments
 (0)