Added option of using amalgamated jsoncpp or external package

ossimlabs · Sep 20, 2019 · c2212ea · c2212ea
1 parent d8a603b
commit c2212ea
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 3 deletions.
diff --git a/atp/CMakeLists.txt b/atp/CMakeLists.txt
@@ -3,6 +3,15 @@ Message("################## Setting up ossim-atp-plugin  #######################
 
 cmake_minimum_required(VERSION 2.8)
 
+find_package( JsonCpp )
+if( JSONCPP_FOUND )
+   include_directories( ${JSONCPP_INCLUDE_DIR} )
+   set( requiredLibs ${requiredLibs} ${JSONCPP_LIBRARY} )
+   message("Found JsonCpp" )
+else( JSONCPP_FOUND )
+   message( FATAL_ERROR "Could not find required JsonCpp package!" )
+endif( JSONCPP_FOUND )
+
 message(" OPENCV_HOME = <${OPENCV_HOME}>")
 find_package(OpenCV)
 if( OPENCV_FOUND )

diff --git a/atp/src/ossimAtpTool.cpp b/atp/src/ossimAtpTool.cpp
@@ -19,8 +19,7 @@ using namespace ossim;
 namespace ATP
 {
 const char* ossimAtpTool::DESCRIPTION =
-      "Provides automatic tiepoint generation functionality. This tool uses JSON format to "
-      "communicate requests and results.";
+      "Provides automatic tiepoint generation functionality.";
 
 ossimAtpTool::ossimAtpTool()
 : m_outputStream (0),

diff --git a/dem/CMakeLists.txt b/dem/CMakeLists.txt
@@ -5,6 +5,15 @@ include(OssimVersion)
 include(OssimCommonVariables)
 include(OssimUtilities)
 
+find_package( JsonCpp )
+if( JSONCPP_FOUND )
+   include_directories( ${JSONCPP_INCLUDE_DIR} )
+   set( requiredLibs ${requiredLibs} ${JSONCPP_LIBRARY} )
+   message("Found JsonCpp" )
+else( JSONCPP_FOUND )
+   message( FATAL_ERROR "Could not find required JsonCpp package!" )
+endif( JSONCPP_FOUND )
+
 message(" OPENCV_HOME = <${OPENCV_HOME}>")
 find_package(OpenCV)
 if( OPENCV_FOUND )

diff --git a/dem/test/dem-test.cpp b/dem/test/dem-test.cpp
@@ -49,7 +49,7 @@
 #include <ossim/base/Thread.h>
 #include <ossim/projection/ossimNitfRpcModel.h>
 #include <ossim/projection/ossimQuickbirdRpcModel.h>
-#include <ossim/json/json.h>
+#include <json/json.h>
 #include <dem/src/ossimDemTool.h>
 
 using namespace std;

diff --git a/potrace/CMakeLists.txt b/potrace/CMakeLists.txt
@@ -12,6 +12,15 @@ else(OSSIM_FOUND)
    message(FATAL_ERROR "Could not find ossim")
 endif(OSSIM_FOUND)
 
+find_package( JsonCpp )
+if( JSONCPP_FOUND )
+   include_directories( ${JSONCPP_INCLUDE_DIR} )
+   set( requiredLibs ${requiredLibs} ${JSONCPP_LIBRARY} )
+   message("Found JsonCpp" )
+else( JSONCPP_FOUND )
+   message( FATAL_ERROR "Could not find required JsonCpp package!" )
+endif( JSONCPP_FOUND )
+
 add_subdirectory( src )
 
 message( "************** END SETUP FOR ossim_potrace_plugin ******************" )