Merge remote-tracking branch 'upstream/master' into CMakeBuildUpdates-master-20200312

Had to update my feature branch to account for the renaming of the
JSONParser and XMLParser packages/libraries.

CMakeLists.txt

@@ -24,8 +24,8 @@ find_package( GeoModelCore REQUIRED )
 find_package( GeoModelIO REQUIRED )
 
 # Set up the build of the libraries of the project.
-add_subdirectory( XMLParser )
-add_subdirectory( JSONParser )
+add_subdirectory( GeoModelXMLParser )
+add_subdirectory( GeoModelJSONParser )
 add_subdirectory( ExpressionEvaluator )
 add_subdirectory( GMCAT )
 

JSONParser/CMakeLists.txt → GeoModelJSONParser/CMakeLists.txt

@@ -2,34 +2,34 @@
 
 # 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} )
-target_link_libraries( JSONParser PUBLIC nlohmann_json::nlohmann_json )
-target_include_directories( JSONParser PUBLIC
+add_library( GeoModelJSONParser SHARED ${HEADERS} ${SOURCES} )
+target_link_libraries( GeoModelJSONParser PUBLIC nlohmann_json::nlohmann_json )
+target_include_directories( GeoModelJSONParser PUBLIC
    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
-source_group( "JSONParser" FILES ${HEADERS} )
+source_group( "GeoModelJSONParser" FILES ${HEADERS} )
 source_group( "src" FILES ${SOURCES} )
-set_target_properties( JSONParser PROPERTIES
+set_target_properties( GeoModelJSONParser PROPERTIES
    VERSION ${PROJECT_VERSION}
    SOVERSION ${PROJECT_VERSION_MAJOR} )
 if( GEOMODEL_USE_BUILTIN_JSON )
-   add_dependencies( JSONParser JSON )
+   add_dependencies( GeoModelJSONParser JSON )
 endif()
 
 # Install the library.
-install( TARGETS JSONParser
+install( TARGETS GeoModelJSONParser
    EXPORT ${PROJECT_NAME}-export
    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
    COMPONENT Runtime
    NAMELINK_SKIP )
-install( TARGETS JSONParser
+install( TARGETS GeoModelJSONParser
    EXPORT ${PROJECT_NAME}-export
    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
    COMPONENT Development
    NAMELINK_ONLY )
 install( FILES ${HEADERS}
-   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/JSONParser
+   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GeoModelJSONParser
    COMPONENT Development )

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

@@ -2,35 +2,35 @@
 
 # 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} )
-target_link_libraries( XMLParser PUBLIC XercesC::XercesC ExpressionEvaluator )
-target_include_directories( XMLParser SYSTEM PUBLIC )
-target_include_directories( XMLParser PUBLIC
+add_library( GeoModelXMLParser SHARED ${HEADERS} ${SOURCES} )
+target_link_libraries( GeoModelXMLParser PUBLIC XercesC::XercesC
+   ExpressionEvaluator )
+target_include_directories( GeoModelXMLParser PUBLIC
    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> )
-source_group( "XMLParser" FILES ${HEADERS} )
+source_group( "GeoModelXMLParser" FILES ${HEADERS} )
 source_group( "src" FILES ${SOURCES} )
-set_target_properties( XMLParser PROPERTIES
+set_target_properties( GeoModelXMLParser PROPERTIES
    VERSION ${PROJECT_VERSION}
    SOVERSION ${PROJECT_VERSION_MAJOR} )
 if( GEOMODEL_USE_BUILTIN_XERCESC )
-   add_dependencies( XMLParser XercesC )
+   add_dependencies( GeoModelXMLParser XercesC )
 endif()
 
 # Install the library.
-install( TARGETS XMLParser
+install( TARGETS GeoModelXMLParser
    EXPORT ${PROJECT_NAME}-export
    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
    COMPONENT Runtime
    NAMELINK_SKIP )
-install( TARGETS XMLParser
+install( TARGETS GeoModelXMLParser
    EXPORT ${PROJECT_NAME}-export
    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
    COMPONENT Development
    NAMELINK_ONLY )
 install( FILES ${HEADERS}
-   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/XMLParser
+   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GeoModelXMLParser
    COMPONENT Development )

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"

README.md

 # GeoModelTools 
 
 Tools and utilities for GeoModel-based detector description projects
+
+