renaming XMLParser to GeoModelXMLParser and JSONParser to GeoModelJSONParser...

renaming XMLParser to GeoModelXMLParser and JSONParser to GeoModelJSONParser (as per Attila's request)

CMakeLists.txt

@@ -2,13 +2,13 @@
 cmake_minimum_required( VERSION 3.1 )
 project( "GeoModelTools" VERSION 1.0.0 LANGUAGES CXX )
 
-add_subdirectory(XMLParser)
-add_subdirectory(JSONParser)
+add_subdirectory(GeoModelXMLParser)
+add_subdirectory(GeoModelJSONParser)
 add_subdirectory(ExpressionEvaluator)
 add_subdirectory(GMCAT)
 
-install(EXPORT JSONParser-export FILE GeoModelTools-JSONParser.cmake DESTINATION lib/cmake/GeoModelTools)
-install(EXPORT XMLParser-export FILE GeoModelTools-XMLParser.cmake DESTINATION lib/cmake/GeoModelTools)
+install(EXPORT GeoModelJSONParser-export FILE GeoModelTools-GeoModelJSONParser.cmake DESTINATION lib/cmake/GeoModelTools)
+install(EXPORT GeoModelXMLParser-export FILE GeoModelTools-GeoModelXMLParser.cmake DESTINATION lib/cmake/GeoModelTools)
 install(EXPORT ExpressionEvaluator-export FILE GeoModelTools-ExpressionEvaluator.cmake DESTINATION lib/cmake/GeoModelTools)
 
 install(FILES cmake/GeoModelToolsConfig.cmake DESTINATION lib/cmake/GeoModelTools)

JSONParser/CMakeLists.txt → GeoModelJSONParser/CMakeLists.txt

 cmake_minimum_required( VERSION 3.1 )
 
 # Set up the project.
-project( "JSONParser" VERSION 1.0.0 LANGUAGES CXX )
+project( "GeoModelJSONParser" VERSION 1.0.0 LANGUAGES CXX )
 
 find_package( GeoModelCore  REQUIRED )
 find_package( nlohmann_json QUIET )
@@ -18,27 +18,27 @@ include( GNUInstallDirs )
 
 # Find the header and source files.
 file( GLOB SOURCES src/*.cxx )
-file( GLOB HEADERS JSONParser/*.h )
+file( GLOB HEADERS GeoModelJSONParser/*.h )
 
 # Create the library.
-add_library( JSONParser SHARED ${HEADERS} ${SOURCES} )
-set_property( TARGET JSONParser
+add_library( GeoModelJSONParser SHARED ${HEADERS} ${SOURCES} )
+set_property( TARGET GeoModelJSONParser
    PROPERTY PUBLIC_HEADER ${HEADERS} )
 if( nlohmann_json_FOUND )
-  target_link_libraries( JSONParser PUBLIC nlohmann_json::nlohmann_json GeoModelCore::GeoModelKernel )
+  target_link_libraries( GeoModelJSONParser PUBLIC nlohmann_json::nlohmann_json GeoModelCore::GeoModelKernel )
 else()
   message(STATUS "'nlohmann_json' not found by CMake!! Anyway, if you installed the single header file in a standard system include dir, I will be able to use it.")
-  target_link_libraries( JSONParser PUBLIC GeoModelCore::GeoModelKernel )
+  target_link_libraries( GeoModelJSONParser PUBLIC GeoModelCore::GeoModelKernel )
 endif()
-target_include_directories( JSONParser SYSTEM PUBLIC ${EIGEN3_INCLUDE_DIR} )
-target_include_directories( JSONParser PUBLIC
+target_include_directories( GeoModelJSONParser SYSTEM PUBLIC ${EIGEN3_INCLUDE_DIR} )
+target_include_directories( GeoModelJSONParser PUBLIC
    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
    $<INSTALL_INTERFACE:include> )
-source_group( "JSONParser" FILES ${HEADERS} )
+source_group( "GeoModelJSONParser" FILES ${HEADERS} )
 source_group( "src" FILES ${SOURCES} )
 
-install( TARGETS JSONParser EXPORT JSONParser-export LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-  PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/JSONParser )
+install( TARGETS GeoModelJSONParser EXPORT GeoModelJSONParser-export LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GeoModelJSONParser )
 #
 # Version the shared library. (Please update when cutting a new release!)
 #
@@ -47,4 +47,4 @@ set(MYLIB_VERSION_MINOR 1)
 set(MYLIB_VERSION_PATCH 0)
 set(MYLIB_VERSION_STRING ${MYLIB_VERSION_MAJOR}.${MYLIB_VERSION_MINOR}.${MYLIB_VERSION_PATCH})
 
-set_target_properties(JSONParser PROPERTIES VERSION ${MYLIB_VERSION_STRING} SOVERSION ${MYLIB_VERSION_MAJOR})
+set_target_properties(GeoModelJSONParser PROPERTIES VERSION ${MYLIB_VERSION_STRING} SOVERSION ${MYLIB_VERSION_MAJOR})

JSONParser/JSONParser/JSONParser.h → GeoModelJSONParser/GeoModelJSONParser/JSONParser.h

@@ -7,8 +7,8 @@
 #include <sstream>
 #include <string>
 
-#include "JSONParser/handlerStore.h"
-#include "JSONParser/JSONHandler.h"
+#include "GeoModelJSONParser/handlerStore.h"
+#include "GeoModelJSONParser/JSONHandler.h"
 
 using json = nlohmann::json;
 

JSONParser/src/handlerStore.cxx → GeoModelJSONParser/src/handlerStore.cxx

-#include "JSONParser/handlerStore.h"
-#include "JSONParser/JSONHandler.h"
+#include "GeoModelJSONParser/handlerStore.h"
+#include "GeoModelJSONParser/JSONHandler.h"
 
 handlerStore* handlerStore::getHandlerStore() 
 {

XMLParser/CMakeLists.txt → GeoModelXMLParser/CMakeLists.txt

 cmake_minimum_required( VERSION 3.1 )
 
 # Set up the project.
-project( "XMLParser" VERSION 1.0.0 LANGUAGES CXX )
+project( "GeoModelXMLParser" VERSION 1.0.0 LANGUAGES CXX )
 
 find_package( GeoModelCore REQUIRED )
 find_package( XercesC REQUIRED )
@@ -17,33 +17,33 @@ include( GNUInstallDirs )
 
 # Find the header and source files.
 file( GLOB SOURCES src/*.cxx )
-file( GLOB HEADERS XMLParser/*.h )
+file( GLOB HEADERS GeoModelXMLParser/*.h )
 
 # Create the library.
-add_library( XMLParser SHARED ${HEADERS} ${SOURCES} )
-set_property( TARGET XMLParser
+add_library( GeoModelXMLParser SHARED ${HEADERS} ${SOURCES} )
+set_property( TARGET GeoModelXMLParser
    PROPERTY PUBLIC_HEADER ${HEADERS} )
-target_link_libraries( XMLParser PUBLIC ExpressionEvaluator XercesC::XercesC GeoModelCore::GeoModelKernel )
-target_include_directories( XMLParser SYSTEM PUBLIC )
-target_include_directories( XMLParser PUBLIC
+target_link_libraries( GeoModelXMLParser PUBLIC ExpressionEvaluator XercesC::XercesC GeoModelCore::GeoModelKernel )
+target_include_directories( GeoModelXMLParser SYSTEM PUBLIC )
+target_include_directories( GeoModelXMLParser PUBLIC
    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
    $<INSTALL_INTERFACE:include> )
-source_group( "XMLParser" FILES ${HEADERS} )
+source_group( "GeoModelXMLParser" FILES ${HEADERS} )
 source_group( "src" FILES ${SOURCES} )
 
 # # Install the library.
-# install( TARGETS XMLParser
-#    EXPORT XMLParser
+# install( TARGETS GeoModelXMLParser
+#    EXPORT GeoModelXMLParser
 #    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-#    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/XMLParser )
+#    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GeoModelXMLParser )
 
 # Install a CMake description of the project/library.
-# install( EXPORT XMLParser DESTINATION cmake )
+# install( EXPORT GeoModelXMLParser DESTINATION cmake )
 
 
 # new test GeoModelCore
-install( TARGETS XMLParser EXPORT XMLParser-export LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-  PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/XMLParser )
+install( TARGETS GeoModelXMLParser EXPORT GeoModelXMLParser-export LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+  PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GeoModelXMLParser )
 #
 # Version the shared library. (Please update when cutting a new release!)
 #
@@ -52,5 +52,5 @@ set(MYLIB_VERSION_MINOR 1)
 set(MYLIB_VERSION_PATCH 0)
 set(MYLIB_VERSION_STRING ${MYLIB_VERSION_MAJOR}.${MYLIB_VERSION_MINOR}.${MYLIB_VERSION_PATCH})
 
-set_target_properties(XMLParser PROPERTIES VERSION ${MYLIB_VERSION_STRING} SOVERSION ${MYLIB_VERSION_MAJOR})
+set_target_properties(GeoModelXMLParser PROPERTIES VERSION ${MYLIB_VERSION_STRING} SOVERSION ${MYLIB_VERSION_MAJOR})
 

XMLParser/XMLParser/XercesParser.h → GeoModelXMLParser/GeoModelXMLParser/XercesParser.h

@@ -6,7 +6,7 @@
 #define XercesParser_H
 
 #include <string>
-#include "XMLParser/IAGDDParser.h"
+#include "GeoModelXMLParser/IAGDDParser.h"
 
 #include <xercesc/dom/DOM.hpp>
 #include <xercesc/parsers/XercesDOMParser.hpp>

XMLParser/src/XMLHandler.cxx → GeoModelXMLParser/src/XMLHandler.cxx

@@ -2,8 +2,8 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "XMLParser/XMLHandler.h"
-#include "XMLParser/XMLHandlerStore.h"
+#include "GeoModelXMLParser/XMLHandler.h"
+#include "GeoModelXMLParser/XMLHandlerStore.h"
 
 #include "ExpressionEvaluator/ExpressionEvaluator.h"
 

XMLParser/src/XMLHandlerStore.cxx → GeoModelXMLParser/src/XMLHandlerStore.cxx

@@ -2,8 +2,8 @@
   Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "XMLParser/XMLHandlerStore.h"
-#include "XMLParser/XMLHandler.h"
+#include "GeoModelXMLParser/XMLHandlerStore.h"
+#include "GeoModelXMLParser/XMLHandler.h"
 
 #include <iostream>
 

XMLParser/src/XercesParser.cxx → GeoModelXMLParser/src/XercesParser.cxx

@@ -4,9 +4,9 @@
 
 #include <iostream>
 
-#include "XMLParser/XercesParser.h"
-#include "XMLParser/XMLHandler.h"
-#include "XMLParser/XMLHandlerStore.h"
+#include "GeoModelXMLParser/XercesParser.h"
+#include "GeoModelXMLParser/XMLHandler.h"
+#include "GeoModelXMLParser/XMLHandlerStore.h"
 
 #include "xercesc/util/PlatformUtils.hpp"
 #include "xercesc/util/XMLException.hpp"

cmake/GeoModelToolsConfig.cmake

 get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
 include(${SELF_DIR}/GeoModelTools-ExpressionEvaluator.cmake)
-include(${SELF_DIR}/GeoModelTools-JSONParser.cmake)
-include(${SELF_DIR}/GeoModelTools-XMLParser.cmake)
+include(${SELF_DIR}/GeoModelTools-GeoModelJSONParser.cmake)
+include(${SELF_DIR}/GeoModelTools-GeoModelXMLParser.cmake)