Skip to content

Commit 2941cb3

Browse files
committed
Merge pull request open-source-parsers#156 from cdunn2001/with-cmake-package
fix JSONCPP_WITH_CMAKE_PACKAGE open-source-parsers#155
2 parents fe855fb + 6361214 commit 2941cb3

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

src/lib_json/CMakeLists.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,13 @@ SET(jsoncpp_sources
4040
json_writer.cpp
4141
version.h.in)
4242

43+
# Install instructions for this target
44+
IF(JSONCPP_WITH_CMAKE_PACKAGE)
45+
SET(INSTALL_EXPORT EXPORT jsoncpp)
46+
ELSE(JSONCPP_WITH_CMAKE_PACKAGE)
47+
SET(INSTALL_EXPORT)
48+
ENDIF(JSONCPP_WITH_CMAKE_PACKAGE)
49+
4350
IF(JSONCPP_LIB_BUILD_SHARED)
4451
ADD_DEFINITIONS( -DJSON_DLL_BUILD )
4552
ADD_LIBRARY(jsoncpp_lib SHARED ${PUBLIC_HEADERS} ${jsoncpp_sources})
@@ -77,10 +84,3 @@ IF(JSONCPP_LIB_BUILD_STATIC)
7784
ENDIF(NOT CMAKE_VERSION VERSION_LESS 2.8.11)
7885

7986
ENDIF()
80-
81-
# Install instructions for this target
82-
IF(JSONCPP_WITH_CMAKE_PACKAGE)
83-
SET(INSTALL_EXPORT EXPORT jsoncpp)
84-
ELSE(JSONCPP_WITH_CMAKE_PACKAGE)
85-
SET(INSTALL_EXPORT)
86-
ENDIF(JSONCPP_WITH_CMAKE_PACKAGE)

0 commit comments

Comments
 (0)