fix JSONCPP_WITH_CMAKE_PACKAGE #155
authorChristopher Dunn <cdunn2001@gmail.com>
Sat, 7 Feb 2015 17:34:40 +0000 (11:34 -0600)
committerChristopher Dunn <cdunn2001@gmail.com>
Sat, 7 Feb 2015 17:39:16 +0000 (11:39 -0600)
mv JSONCPP_WITH_CMAKE_PACKAGE ahead of INSTALL def.

src/lib_json/CMakeLists.txt

index 133d110..856b164 100644 (file)
@@ -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)