Returned to using jsoncpp in amalgamated form (no external lib depend…

…ency)

CMakeLists.txt

@@ -103,16 +103,6 @@ else( TIFF_FOUND )
    message( FATAL_ERROR "Could not find required tiff package!" )
 endif( TIFF_FOUND )
 
-# JSONCPP - Required:
-find_package( JsonCpp )
-if( JSONCPP_FOUND )
-   include_directories( ${JSONCPP_INCLUDE_DIR} )
-   set( ossimDependentLibs ${ossimDependentLibs} ${JSONCPP_LIBRARY} )
-   message("Found JsonCpp" )
-else( JSONCPP_FOUND )
-   message( FATAL_ERROR "Could not find required JsonCpp package!" )
-endif( JSONCPP_FOUND )
-
 # This caused a core dump on ossim executables running in jenins pipeline (ossim-test-dev)
 if (CMAKE_SYSTEM_NAME MATCHES "Linux")
   find_library( DL_LIBRARY dl )
@@ -134,17 +124,6 @@ endif() # if (CMAKE_SYSTEM_NAME MATCHES "Linux")
 #   endif( DL_LIBRARY )
 #endif( UNIX )
 
-# JSONCPP - Optional:
-set( OSSIM_HAS_JSONCPP 0 )
-find_package( JsonCpp )
-if( JSONCPP_FOUND )
-   include_directories( ${JSONCPP_INCLUDE_DIR} )
-   set( ossimDependentLibs ${ossimDependentLibs} ${JSONCPP_LIBRARY} )
-   set( OSSIM_HAS_JSONCPP 1 )
-else( JSONCPP_FOUND )
-   message("Could not find optional JSONCPP package! Consider installing this as it will soon become a required package." )
-endif( JSONCPP_FOUND )
-
 # FREETYPE - Optional:
 set( OSSIM_HAS_FREETYPE 0 )
 if( BUILD_OSSIM_FREETYPE_SUPPORT )
@@ -276,8 +255,6 @@ MESSAGE( STATUS "JPEG_LIBRARY                    = ${JPEG_LIBRARIES}" )
 MESSAGE( STATUS "JPEG_INCLUDE                    = ${JPEG_INCLUDE_DIR}" )
 MESSAGE( STATUS "OSSIM DEPENDENT LIBRARIES       = ${ossimDependentLibs}" )
 MESSAGE( STATUS "OSSIM_HAS_HDF5                  = ${OSSIM_HAS_HDF5}" )
-MESSAGE( STATUS "OSSIM_HAS_JSONCPP               = ${OSSIM_HAS_JSONCPP}" )
-
 
 #-----------------------------------------------------------------------------
 # uninstall target

apps/ossim-rpcgen/ossim-rpcgen.cpp

@@ -197,7 +197,6 @@ int main(int argc, char* argv[])
    {
    case JSON:
    {
-#if OSSIM_HAS_JSONCPP
       if (outputFile)
          jsonFile = outputFile;
       else
@@ -210,11 +209,6 @@ int main(int argc, char* argv[])
          write_ok = rpc->toJSON(jsonStream);
          jsonStream.close();
       }
-#else
-      ossimNotify(ossimNotifyLevel_FATAL) << "ERROR: JSON output requested but JSON is not "
-            "available in this build! <"<< std::endl;
-      exit(1);
-#endif
       break;
    }
 

include/ossim/base/JsonInterface.h

@@ -7,7 +7,7 @@
 #ifndef JsonInterface_HEADER
 #define JsonInterface_HEADER 1
 
-#include <json/json.h>
+#include <ossim/json/json.h>
 
 namespace ossim {