3party/jsoncpp
0
0
Fork 0
mirror of https://github.com/open-source-parsers/jsoncpp.git synced 2025-01-14 18:07:56 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #156 from cdunn2001/with-cmake-package

Browse Source 
fix JSONCPP_WITH_CMAKE_PACKAGE #155
This commit is contained in:
Christopher Dunn 2015-02-07 11:44:24 -06:00
commit 2941cb3fe2
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lib_json/CMakeLists.txt
View File

@ -40,6 +40,13 @@ SET(jsoncpp_sources
json_writer.cpp json_writer.cpp
version.h.in) version.h.in)
# Install instructions for this target
IF(JSONCPP_WITH_CMAKE_PACKAGE)
SET(INSTALL_EXPORT EXPORT jsoncpp)
ELSE(JSONCPP_WITH_CMAKE_PACKAGE)
SET(INSTALL_EXPORT)
ENDIF(JSONCPP_WITH_CMAKE_PACKAGE)
IF(JSONCPP_LIB_BUILD_SHARED) IF(JSONCPP_LIB_BUILD_SHARED)
ADD_DEFINITIONS( -DJSON_DLL_BUILD ) ADD_DEFINITIONS( -DJSON_DLL_BUILD )
ADD_LIBRARY(jsoncpp_lib SHARED ${PUBLIC_HEADERS} ${jsoncpp_sources}) ADD_LIBRARY(jsoncpp_lib SHARED ${PUBLIC_HEADERS} ${jsoncpp_sources})
@ -77,10 +84,3 @@ IF(JSONCPP_LIB_BUILD_STATIC)
ENDIF(NOT CMAKE_VERSION VERSION_LESS 2.8.11) ENDIF(NOT CMAKE_VERSION VERSION_LESS 2.8.11)
ENDIF() ENDIF()
# Install instructions for this target
IF(JSONCPP_WITH_CMAKE_PACKAGE)
SET(INSTALL_EXPORT EXPORT jsoncpp)
ELSE(JSONCPP_WITH_CMAKE_PACKAGE)
SET(INSTALL_EXPORT)
ENDIF(JSONCPP_WITH_CMAKE_PACKAGE)