From 636121485c4a0798521e441d17e2c0e0c23df19b Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Sat, 7 Feb 2015 11:34:40 -0600 Subject: [PATCH] fix JSONCPP_WITH_CMAKE_PACKAGE #155 mv JSONCPP_WITH_CMAKE_PACKAGE ahead of INSTALL def. --- src/lib_json/CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lib_json/CMakeLists.txt b/src/lib_json/CMakeLists.txt index 133d110..856b164 100644 --- a/src/lib_json/CMakeLists.txt +++ b/src/lib_json/CMakeLists.txt @@ -40,6 +40,13 @@ SET(jsoncpp_sources json_writer.cpp 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) ADD_DEFINITIONS( -DJSON_DLL_BUILD ) 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() - -# 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)