Cleaning code

GeoModelJSONParser/CMakeLists.txt

@@ -6,12 +6,19 @@ file( GLOB HEADERS GeoModelJSONParser/*.h )
 
 # Create the library.
 add_library( GeoModelJSONParser SHARED ${HEADERS} ${SOURCES} )
-if (nlohmann_json_FOUND)
-  # we link to nlohmann_json only  if we use a version of nlohmann_json installed through CMake;
+
+# If we use standalone-build of nlohmann_json parser
+if( GEOMODEL_USE_BUILTIN_JSON )
+   add_dependencies( GeoModelJSONParser JSON )
+endif()
+
+# We link to `nlohmann_json` only  if we use a version of nlohmann_json installed through CMake;
 # this is not needed if the single-header library is installed in a regular
 # system include folder (e.g., '/usr/local/include')
+if ( nlohmann_json_FOUND OR GEOMODEL_USE_BUILTIN_JSON )
   target_link_libraries( GeoModelJSONParser PUBLIC nlohmann_json::nlohmann_json )
 endif()
+
 target_include_directories( GeoModelJSONParser PUBLIC
    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
@@ -20,9 +27,6 @@ source_group( "src" FILES ${SOURCES} )
 set_target_properties( GeoModelJSONParser PROPERTIES
    VERSION ${PROJECT_VERSION}
    SOVERSION ${PROJECT_VERSION_MAJOR} )
-if( GEOMODEL_USE_BUILTIN_JSON )
-   add_dependencies( GeoModelJSONParser JSON )
-endif()
 
 # Install the library.
 install( TARGETS GeoModelJSONParser

GeoModelJSONParser/GeoModelJSONParser/JSONHandler.h

@@ -4,7 +4,7 @@
 #include <map>
 #include <string>
 
-#include "nlohmann/json.hpp"
+#include <nlohmann/json.hpp>
 
 using nlohmann::json;
 

cmake/SetupJSON.cmake

@@ -19,6 +19,7 @@ if( GEOMODEL_USE_BUILTIN_JSON )
    set( nlohmann_json_INCLUDE_DIR
       "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/JSONInstall/${CMAKE_INSTALL_INCLUDEDIR}" )
    set( nlohmann_json_INCLUDE_DIRS "${nlohmann_json_INCLUDE_DIR}" )
+   message(STATUS "Installing the built-in 'nlohmann_json' in: ${nlohmann_json_INCLUDE_DIR}")
 
    # Create the include directory already, otherwise CMake refuses to
    # create the imported target.