diff --git a/CMakeLists.txt b/CMakeLists.txt deleted file mode 100644 index 5d35956d88df2fef75e4ea6eac6e36556f084dad..0000000000000000000000000000000000000000 --- a/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -# Set up the project. -cmake_minimum_required( VERSION 3.1 ) -project( "GMX" VERSION 1.0.0 LANGUAGES CXX ) - -# By default prefer not to use frameworks on macOS. -# But use it at a "LAST" resource, if no other options worked. -# For details on the behaviour of this cache variable, see: -# - https://cmake.org/cmake/help/v3.0/command/find_file.html -set( CMAKE_FIND_FRAMEWORK "LAST" CACHE STRING - "Framework finding behaviour on macOS" ) - - -add_subdirectory(GeoModelXml) -add_subdirectory(GMXPlugin) - -install(EXPORT GeoModelXml-export FILE GMX-GeoModelXml.cmake DESTINATION lib/cmake/GMX) - -install(FILES cmake/GMXConfig.cmake DESTINATION lib/cmake/GMX) - diff --git a/GeoModelXml/CMakeLists.txt b/GeoModelXml/CMakeLists.txt index f62889b8f5ca6ecf5c330cceb59956fbb572bd7b..5d35956d88df2fef75e4ea6eac6e36556f084dad 100644 --- a/GeoModelXml/CMakeLists.txt +++ b/GeoModelXml/CMakeLists.txt @@ -1,52 +1,19 @@ -cmake_minimum_required( VERSION 3.1 ) - # Set up the project. -project( "GeoModelXml" VERSION 1.0.0 LANGUAGES CXX ) - -find_package( GeoModelCore REQUIRED ) -find_package( Eigen3 REQUIRED ) -find_package( GeoModelTools REQUIRED ) -find_package( Eigen3 REQUIRED ) -find_package( XercesC REQUIRED ) -find_package( ZLIB REQUIRED ) - - -# Set default build options. -set( CMAKE_BUILD_TYPE "Release" CACHE STRING "CMake build mode to use" ) -set( CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard used for the build" ) -set( CMAKE_CXX_EXTENSIONS FALSE CACHE BOOL "(Dis)allow using GNU extensions" ) - -# Use the GNU install directory names. -include( GNUInstallDirs ) +cmake_minimum_required( VERSION 3.1 ) +project( "GMX" VERSION 1.0.0 LANGUAGES CXX ) -# Find the header and source files. -file( GLOB SOURCES src/*.cxx ) -file( GLOB HEADERS GeoModelXml/*.h ) -file( GLOB SHAPEHEADERS GeoModelXml/shape/*.h ) +# By default prefer not to use frameworks on macOS. +# But use it at a "LAST" resource, if no other options worked. +# For details on the behaviour of this cache variable, see: +# - https://cmake.org/cmake/help/v3.0/command/find_file.html +set( CMAKE_FIND_FRAMEWORK "LAST" CACHE STRING + "Framework finding behaviour on macOS" ) -# Create the library. -add_library( GeoModelXml SHARED ${HEADERS} ${SOURCES} ) -set_property( TARGET GeoModelXml - PROPERTY PUBLIC_HEADER ${HEADERS} ) +add_subdirectory(GeoModelXml) +add_subdirectory(GMXPlugin) -target_compile_definitions( GeoModelXml PUBLIC -DSTANDALONE_GMX ) -target_link_libraries( GeoModelXml PUBLIC GeoModelCore::GeoModelKernel GeoModelTools::ExpressionEvaluator XercesC::XercesC ZLIB::ZLIB ) -# target_include_directories( AGDDKernel SYSTEM PUBLIC ${EIGEN3_INCLUDE_DIR} ) ) -target_include_directories( GeoModelXml PUBLIC ${EIGEN3_INCLUDE_DIR} - $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> - $<INSTALL_INTERFACE:include> ) -source_group( "GeoModelXml" FILES ${HEADERS} ) -source_group( "src" FILES ${SOURCES} ) +install(EXPORT GeoModelXml-export FILE GMX-GeoModelXml.cmake DESTINATION lib/cmake/GMX) +install(FILES cmake/GMXConfig.cmake DESTINATION lib/cmake/GMX) -# -install( TARGETS GeoModelXml EXPORT GeoModelXml-export LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GeoModelXml ) -install( FILES ${SHAPEHEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GeoModelXml/shape) -# -# Version the shared library. -# -set_target_properties( GeoModelXml PROPERTIES - VERSION ${PROJECT_VERSION} - SOVERSION ${PROJECT_VERSION_MAJOR} ) diff --git a/GMXPlugin/CMakeLists.txt b/GeoModelXml/GMXPlugin/CMakeLists.txt similarity index 100% rename from GMXPlugin/CMakeLists.txt rename to GeoModelXml/GMXPlugin/CMakeLists.txt diff --git a/GMXPlugin/data/HelloWorld.gmx b/GeoModelXml/GMXPlugin/data/HelloWorld.gmx similarity index 100% rename from GMXPlugin/data/HelloWorld.gmx rename to GeoModelXml/GMXPlugin/data/HelloWorld.gmx diff --git a/GMXPlugin/data/StripBlobRev_5433bf5.xml b/GeoModelXml/GMXPlugin/data/StripBlobRev_5433bf5.xml similarity index 100% rename from GMXPlugin/data/StripBlobRev_5433bf5.xml rename to GeoModelXml/GMXPlugin/data/StripBlobRev_5433bf5.xml diff --git a/GMXPlugin/data/geomodel.dtd b/GeoModelXml/GMXPlugin/data/geomodel.dtd similarity index 100% rename from GMXPlugin/data/geomodel.dtd rename to GeoModelXml/GMXPlugin/data/geomodel.dtd diff --git a/GMXPlugin/src/GMXPlugin.cxx b/GeoModelXml/GMXPlugin/src/GMXPlugin.cxx similarity index 100% rename from GMXPlugin/src/GMXPlugin.cxx rename to GeoModelXml/GMXPlugin/src/GMXPlugin.cxx diff --git a/GeoModelXml/GeoModelXml/CMakeLists.txt b/GeoModelXml/GeoModelXml/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..f62889b8f5ca6ecf5c330cceb59956fbb572bd7b --- /dev/null +++ b/GeoModelXml/GeoModelXml/CMakeLists.txt @@ -0,0 +1,52 @@ +cmake_minimum_required( VERSION 3.1 ) + +# Set up the project. +project( "GeoModelXml" VERSION 1.0.0 LANGUAGES CXX ) + +find_package( GeoModelCore REQUIRED ) +find_package( Eigen3 REQUIRED ) +find_package( GeoModelTools REQUIRED ) +find_package( Eigen3 REQUIRED ) +find_package( XercesC REQUIRED ) +find_package( ZLIB REQUIRED ) + + +# Set default build options. +set( CMAKE_BUILD_TYPE "Release" CACHE STRING "CMake build mode to use" ) +set( CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard used for the build" ) +set( CMAKE_CXX_EXTENSIONS FALSE CACHE BOOL "(Dis)allow using GNU extensions" ) + +# Use the GNU install directory names. +include( GNUInstallDirs ) + +# Find the header and source files. +file( GLOB SOURCES src/*.cxx ) +file( GLOB HEADERS GeoModelXml/*.h ) +file( GLOB SHAPEHEADERS GeoModelXml/shape/*.h ) + + +# Create the library. +add_library( GeoModelXml SHARED ${HEADERS} ${SOURCES} ) +set_property( TARGET GeoModelXml + PROPERTY PUBLIC_HEADER ${HEADERS} ) + +target_compile_definitions( GeoModelXml PUBLIC -DSTANDALONE_GMX ) +target_link_libraries( GeoModelXml PUBLIC GeoModelCore::GeoModelKernel GeoModelTools::ExpressionEvaluator XercesC::XercesC ZLIB::ZLIB ) +# target_include_directories( AGDDKernel SYSTEM PUBLIC ${EIGEN3_INCLUDE_DIR} ) ) +target_include_directories( GeoModelXml PUBLIC ${EIGEN3_INCLUDE_DIR} + $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> + $<INSTALL_INTERFACE:include> ) +source_group( "GeoModelXml" FILES ${HEADERS} ) +source_group( "src" FILES ${SOURCES} ) + + +# +install( TARGETS GeoModelXml EXPORT GeoModelXml-export LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GeoModelXml ) +install( FILES ${SHAPEHEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GeoModelXml/shape) +# +# Version the shared library. +# +set_target_properties( GeoModelXml PROPERTIES + VERSION ${PROJECT_VERSION} + SOVERSION ${PROJECT_VERSION_MAJOR} ) diff --git a/GeoModelXml/GeoModelXml/AddbranchProcessor.h b/GeoModelXml/GeoModelXml/GeoModelXml/AddbranchProcessor.h similarity index 100% rename from GeoModelXml/GeoModelXml/AddbranchProcessor.h rename to GeoModelXml/GeoModelXml/GeoModelXml/AddbranchProcessor.h diff --git a/GeoModelXml/GeoModelXml/AssemblyProcessor.h b/GeoModelXml/GeoModelXml/GeoModelXml/AssemblyProcessor.h similarity index 100% rename from GeoModelXml/GeoModelXml/AssemblyProcessor.h rename to GeoModelXml/GeoModelXml/GeoModelXml/AssemblyProcessor.h diff --git a/GeoModelXml/GeoModelXml/AssemblyrefProcessor.h b/GeoModelXml/GeoModelXml/GeoModelXml/AssemblyrefProcessor.h similarity index 100% rename from GeoModelXml/GeoModelXml/AssemblyrefProcessor.h rename to GeoModelXml/GeoModelXml/GeoModelXml/AssemblyrefProcessor.h diff --git a/GeoModelXml/GeoModelXml/Element2GeoItem.h b/GeoModelXml/GeoModelXml/GeoModelXml/Element2GeoItem.h similarity index 100% rename from GeoModelXml/GeoModelXml/Element2GeoItem.h rename to GeoModelXml/GeoModelXml/GeoModelXml/Element2GeoItem.h diff --git a/GeoModelXml/GeoModelXml/Element2GeoItemRegistry.h b/GeoModelXml/GeoModelXml/GeoModelXml/Element2GeoItemRegistry.h similarity index 100% rename from GeoModelXml/GeoModelXml/Element2GeoItemRegistry.h rename to GeoModelXml/GeoModelXml/GeoModelXml/Element2GeoItemRegistry.h diff --git a/GeoModelXml/GeoModelXml/ElementProcessor.h b/GeoModelXml/GeoModelXml/GeoModelXml/ElementProcessor.h similarity index 100% rename from GeoModelXml/GeoModelXml/ElementProcessor.h rename to GeoModelXml/GeoModelXml/GeoModelXml/ElementProcessor.h diff --git a/GeoModelXml/GeoModelXml/GeoNodeList.h b/GeoModelXml/GeoModelXml/GeoModelXml/GeoNodeList.h similarity index 100% rename from GeoModelXml/GeoModelXml/GeoNodeList.h rename to GeoModelXml/GeoModelXml/GeoModelXml/GeoNodeList.h diff --git a/GeoModelXml/GeoModelXml/Gmx2Geo.h b/GeoModelXml/GeoModelXml/GeoModelXml/Gmx2Geo.h similarity index 100% rename from GeoModelXml/GeoModelXml/Gmx2Geo.h rename to GeoModelXml/GeoModelXml/GeoModelXml/Gmx2Geo.h diff --git a/GeoModelXml/GeoModelXml/GmxInterface.h b/GeoModelXml/GeoModelXml/GeoModelXml/GmxInterface.h similarity index 100% rename from GeoModelXml/GeoModelXml/GmxInterface.h rename to GeoModelXml/GeoModelXml/GeoModelXml/GmxInterface.h diff --git a/GeoModelXml/GeoModelXml/GmxUtil.h b/GeoModelXml/GeoModelXml/GeoModelXml/GmxUtil.h similarity index 100% rename from GeoModelXml/GeoModelXml/GmxUtil.h rename to GeoModelXml/GeoModelXml/GeoModelXml/GmxUtil.h diff --git a/GeoModelXml/GeoModelXml/IndexProcessor.h b/GeoModelXml/GeoModelXml/GeoModelXml/IndexProcessor.h similarity index 100% rename from GeoModelXml/GeoModelXml/IndexProcessor.h rename to GeoModelXml/GeoModelXml/GeoModelXml/IndexProcessor.h diff --git a/GeoModelXml/GeoModelXml/LogvolProcessor.h b/GeoModelXml/GeoModelXml/GeoModelXml/LogvolProcessor.h similarity index 100% rename from GeoModelXml/GeoModelXml/LogvolProcessor.h rename to GeoModelXml/GeoModelXml/GeoModelXml/LogvolProcessor.h diff --git a/GeoModelXml/GeoModelXml/LogvolrefProcessor.h b/GeoModelXml/GeoModelXml/GeoModelXml/LogvolrefProcessor.h similarity index 100% rename from GeoModelXml/GeoModelXml/LogvolrefProcessor.h rename to GeoModelXml/GeoModelXml/GeoModelXml/LogvolrefProcessor.h diff --git a/GeoModelXml/GeoModelXml/MakeElement.h b/GeoModelXml/GeoModelXml/GeoModelXml/MakeElement.h similarity index 100% rename from GeoModelXml/GeoModelXml/MakeElement.h rename to GeoModelXml/GeoModelXml/GeoModelXml/MakeElement.h diff --git a/GeoModelXml/GeoModelXml/MakeMaterial.h b/GeoModelXml/GeoModelXml/GeoModelXml/MakeMaterial.h similarity index 100% rename from GeoModelXml/GeoModelXml/MakeMaterial.h rename to GeoModelXml/GeoModelXml/GeoModelXml/MakeMaterial.h diff --git a/GeoModelXml/GeoModelXml/MakeRotation.h b/GeoModelXml/GeoModelXml/GeoModelXml/MakeRotation.h similarity index 100% rename from GeoModelXml/GeoModelXml/MakeRotation.h rename to GeoModelXml/GeoModelXml/GeoModelXml/MakeRotation.h diff --git a/GeoModelXml/GeoModelXml/MakeTransformation.h b/GeoModelXml/GeoModelXml/GeoModelXml/MakeTransformation.h similarity index 100% rename from GeoModelXml/GeoModelXml/MakeTransformation.h rename to GeoModelXml/GeoModelXml/GeoModelXml/MakeTransformation.h diff --git a/GeoModelXml/GeoModelXml/MakeTransformationref.h b/GeoModelXml/GeoModelXml/GeoModelXml/MakeTransformationref.h similarity index 100% rename from GeoModelXml/GeoModelXml/MakeTransformationref.h rename to GeoModelXml/GeoModelXml/GeoModelXml/MakeTransformationref.h diff --git a/GeoModelXml/GeoModelXml/MakeTranslation.h b/GeoModelXml/GeoModelXml/GeoModelXml/MakeTranslation.h similarity index 100% rename from GeoModelXml/GeoModelXml/MakeTranslation.h rename to GeoModelXml/GeoModelXml/GeoModelXml/MakeTranslation.h diff --git a/GeoModelXml/GeoModelXml/MulticopyProcessor.h b/GeoModelXml/GeoModelXml/GeoModelXml/MulticopyProcessor.h similarity index 100% rename from GeoModelXml/GeoModelXml/MulticopyProcessor.h rename to GeoModelXml/GeoModelXml/GeoModelXml/MulticopyProcessor.h diff --git a/GeoModelXml/GeoModelXml/OutputDirector.h b/GeoModelXml/GeoModelXml/GeoModelXml/OutputDirector.h similarity index 100% rename from GeoModelXml/GeoModelXml/OutputDirector.h rename to GeoModelXml/GeoModelXml/GeoModelXml/OutputDirector.h diff --git a/GeoModelXml/GeoModelXml/PositionIndex.h b/GeoModelXml/GeoModelXml/GeoModelXml/PositionIndex.h similarity index 100% rename from GeoModelXml/GeoModelXml/PositionIndex.h rename to GeoModelXml/GeoModelXml/GeoModelXml/PositionIndex.h diff --git a/GeoModelXml/GeoModelXml/ProcessorRegistry.h b/GeoModelXml/GeoModelXml/GeoModelXml/ProcessorRegistry.h similarity index 100% rename from GeoModelXml/GeoModelXml/ProcessorRegistry.h rename to GeoModelXml/GeoModelXml/GeoModelXml/ProcessorRegistry.h diff --git a/GeoModelXml/GeoModelXml/SensitiveId.h b/GeoModelXml/GeoModelXml/GeoModelXml/SensitiveId.h similarity index 100% rename from GeoModelXml/GeoModelXml/SensitiveId.h rename to GeoModelXml/GeoModelXml/GeoModelXml/SensitiveId.h diff --git a/GeoModelXml/GeoModelXml/StrictErrorHandler.h b/GeoModelXml/GeoModelXml/GeoModelXml/StrictErrorHandler.h similarity index 100% rename from GeoModelXml/GeoModelXml/StrictErrorHandler.h rename to GeoModelXml/GeoModelXml/GeoModelXml/StrictErrorHandler.h diff --git a/GeoModelXml/GeoModelXml/TransformProcessor.h b/GeoModelXml/GeoModelXml/GeoModelXml/TransformProcessor.h similarity index 100% rename from GeoModelXml/GeoModelXml/TransformProcessor.h rename to GeoModelXml/GeoModelXml/GeoModelXml/TransformProcessor.h diff --git a/GeoModelXml/GeoModelXml/TransformrefProcessor.h b/GeoModelXml/GeoModelXml/GeoModelXml/TransformrefProcessor.h similarity index 100% rename from GeoModelXml/GeoModelXml/TransformrefProcessor.h rename to GeoModelXml/GeoModelXml/GeoModelXml/TransformrefProcessor.h diff --git a/GeoModelXml/GeoModelXml/createdomdocument.h b/GeoModelXml/GeoModelXml/GeoModelXml/createdomdocument.h similarity index 100% rename from GeoModelXml/GeoModelXml/createdomdocument.h rename to GeoModelXml/GeoModelXml/GeoModelXml/createdomdocument.h diff --git a/GeoModelXml/GeoModelXml/shape/AddPlane.h b/GeoModelXml/GeoModelXml/GeoModelXml/shape/AddPlane.h similarity index 100% rename from GeoModelXml/GeoModelXml/shape/AddPlane.h rename to GeoModelXml/GeoModelXml/GeoModelXml/shape/AddPlane.h diff --git a/GeoModelXml/GeoModelXml/shape/MakeBox.h b/GeoModelXml/GeoModelXml/GeoModelXml/shape/MakeBox.h similarity index 100% rename from GeoModelXml/GeoModelXml/shape/MakeBox.h rename to GeoModelXml/GeoModelXml/GeoModelXml/shape/MakeBox.h diff --git a/GeoModelXml/GeoModelXml/shape/MakeCons.h b/GeoModelXml/GeoModelXml/GeoModelXml/shape/MakeCons.h similarity index 100% rename from GeoModelXml/GeoModelXml/shape/MakeCons.h rename to GeoModelXml/GeoModelXml/GeoModelXml/shape/MakeCons.h diff --git a/GeoModelXml/GeoModelXml/shape/MakeGenericTrap.h b/GeoModelXml/GeoModelXml/GeoModelXml/shape/MakeGenericTrap.h similarity index 100% rename from GeoModelXml/GeoModelXml/shape/MakeGenericTrap.h rename to GeoModelXml/GeoModelXml/GeoModelXml/shape/MakeGenericTrap.h diff --git a/GeoModelXml/GeoModelXml/shape/MakeIntersection.h b/GeoModelXml/GeoModelXml/GeoModelXml/shape/MakeIntersection.h similarity index 100% rename from GeoModelXml/GeoModelXml/shape/MakeIntersection.h rename to GeoModelXml/GeoModelXml/GeoModelXml/shape/MakeIntersection.h diff --git a/GeoModelXml/GeoModelXml/shape/MakePara.h b/GeoModelXml/GeoModelXml/GeoModelXml/shape/MakePara.h similarity index 100% rename from GeoModelXml/GeoModelXml/shape/MakePara.h rename to GeoModelXml/GeoModelXml/GeoModelXml/shape/MakePara.h diff --git a/GeoModelXml/GeoModelXml/shape/MakePcon.h b/GeoModelXml/GeoModelXml/GeoModelXml/shape/MakePcon.h similarity index 100% rename from GeoModelXml/GeoModelXml/shape/MakePcon.h rename to GeoModelXml/GeoModelXml/GeoModelXml/shape/MakePcon.h diff --git a/GeoModelXml/GeoModelXml/shape/MakePgon.h b/GeoModelXml/GeoModelXml/GeoModelXml/shape/MakePgon.h similarity index 100% rename from GeoModelXml/GeoModelXml/shape/MakePgon.h rename to GeoModelXml/GeoModelXml/GeoModelXml/shape/MakePgon.h diff --git a/GeoModelXml/GeoModelXml/shape/MakeShaperef.h b/GeoModelXml/GeoModelXml/GeoModelXml/shape/MakeShaperef.h similarity index 100% rename from GeoModelXml/GeoModelXml/shape/MakeShaperef.h rename to GeoModelXml/GeoModelXml/GeoModelXml/shape/MakeShaperef.h diff --git a/GeoModelXml/GeoModelXml/shape/MakeSimplePolygonBrep.h b/GeoModelXml/GeoModelXml/GeoModelXml/shape/MakeSimplePolygonBrep.h similarity index 100% rename from GeoModelXml/GeoModelXml/shape/MakeSimplePolygonBrep.h rename to GeoModelXml/GeoModelXml/GeoModelXml/shape/MakeSimplePolygonBrep.h diff --git a/GeoModelXml/GeoModelXml/shape/MakeSubtraction.h b/GeoModelXml/GeoModelXml/GeoModelXml/shape/MakeSubtraction.h similarity index 100% rename from GeoModelXml/GeoModelXml/shape/MakeSubtraction.h rename to GeoModelXml/GeoModelXml/GeoModelXml/shape/MakeSubtraction.h diff --git a/GeoModelXml/GeoModelXml/shape/MakeTrap.h b/GeoModelXml/GeoModelXml/GeoModelXml/shape/MakeTrap.h similarity index 100% rename from GeoModelXml/GeoModelXml/shape/MakeTrap.h rename to GeoModelXml/GeoModelXml/GeoModelXml/shape/MakeTrap.h diff --git a/GeoModelXml/GeoModelXml/shape/MakeTrd.h b/GeoModelXml/GeoModelXml/GeoModelXml/shape/MakeTrd.h similarity index 100% rename from GeoModelXml/GeoModelXml/shape/MakeTrd.h rename to GeoModelXml/GeoModelXml/GeoModelXml/shape/MakeTrd.h diff --git a/GeoModelXml/GeoModelXml/shape/MakeTube.h b/GeoModelXml/GeoModelXml/GeoModelXml/shape/MakeTube.h similarity index 100% rename from GeoModelXml/GeoModelXml/shape/MakeTube.h rename to GeoModelXml/GeoModelXml/GeoModelXml/shape/MakeTube.h diff --git a/GeoModelXml/GeoModelXml/shape/MakeTubs.h b/GeoModelXml/GeoModelXml/GeoModelXml/shape/MakeTubs.h similarity index 100% rename from GeoModelXml/GeoModelXml/shape/MakeTubs.h rename to GeoModelXml/GeoModelXml/GeoModelXml/shape/MakeTubs.h diff --git a/GeoModelXml/GeoModelXml/shape/MakeUnion.h b/GeoModelXml/GeoModelXml/GeoModelXml/shape/MakeUnion.h similarity index 100% rename from GeoModelXml/GeoModelXml/shape/MakeUnion.h rename to GeoModelXml/GeoModelXml/GeoModelXml/shape/MakeUnion.h diff --git a/data/geomodel.dtd b/GeoModelXml/GeoModelXml/data/geomodel.dtd similarity index 96% rename from data/geomodel.dtd rename to GeoModelXml/GeoModelXml/data/geomodel.dtd index e0b0d314610b42f658d0c2bb244623168af97ea5..54cf5c59d9012e4dc64979e0f957d879f805f17a 100644 --- a/data/geomodel.dtd +++ b/GeoModelXml/GeoModelXml/data/geomodel.dtd @@ -65,15 +65,9 @@ <!ELEMENT addindex EMPTY> <!ATTLIST addindex name ID #REQUIRED> - <!ELEMENT shapes ((box|cons|generictrap|para|pcon|pgon|trap|tube|tubs|trd|intersection|subtraction|union|simplepolygonbrep)+)> + <!ELEMENT shapes ((box|cons|generictrap|para|pcon|pgon|trap|tube|tubs|trd|intersection|subtraction|union)+)> <!-- All shapes allowed in GeoModel manual. Same name, parameters, parameter order, but always lower case --> - <!ELEMENT simplepolygonbrep EMPTY> - <!ATTLIST simplepolygonbrep name ID #REQUIRED - xpoints CDATA #REQUIRED - ypoints CDATA #REQUIRED - zhalflength CDATA #REQUIRED> - <!ELEMENT box EMPTY> <!ATTLIST box name ID #REQUIRED xhalflength CDATA #REQUIRED diff --git a/GeoModelXml/oldCMakeLists.txt b/GeoModelXml/GeoModelXml/oldCMakeLists.txt similarity index 100% rename from GeoModelXml/oldCMakeLists.txt rename to GeoModelXml/GeoModelXml/oldCMakeLists.txt diff --git a/GeoModelXml/src/AddPlane.cxx b/GeoModelXml/GeoModelXml/src/AddPlane.cxx similarity index 100% rename from GeoModelXml/src/AddPlane.cxx rename to GeoModelXml/GeoModelXml/src/AddPlane.cxx diff --git a/GeoModelXml/src/AddbranchProcessor.cxx b/GeoModelXml/GeoModelXml/src/AddbranchProcessor.cxx similarity index 100% rename from GeoModelXml/src/AddbranchProcessor.cxx rename to GeoModelXml/GeoModelXml/src/AddbranchProcessor.cxx diff --git a/GeoModelXml/src/AssemblyProcessor.cxx b/GeoModelXml/GeoModelXml/src/AssemblyProcessor.cxx similarity index 100% rename from GeoModelXml/src/AssemblyProcessor.cxx rename to GeoModelXml/GeoModelXml/src/AssemblyProcessor.cxx diff --git a/GeoModelXml/src/AssemblyrefProcessor.cxx b/GeoModelXml/GeoModelXml/src/AssemblyrefProcessor.cxx similarity index 100% rename from GeoModelXml/src/AssemblyrefProcessor.cxx rename to GeoModelXml/GeoModelXml/src/AssemblyrefProcessor.cxx diff --git a/GeoModelXml/src/Element2GeoItem.cxx b/GeoModelXml/GeoModelXml/src/Element2GeoItem.cxx similarity index 100% rename from GeoModelXml/src/Element2GeoItem.cxx rename to GeoModelXml/GeoModelXml/src/Element2GeoItem.cxx diff --git a/GeoModelXml/src/Element2GeoItemRegistry.cxx b/GeoModelXml/GeoModelXml/src/Element2GeoItemRegistry.cxx similarity index 100% rename from GeoModelXml/src/Element2GeoItemRegistry.cxx rename to GeoModelXml/GeoModelXml/src/Element2GeoItemRegistry.cxx diff --git a/GeoModelXml/src/ElementProcessor.cxx b/GeoModelXml/GeoModelXml/src/ElementProcessor.cxx similarity index 100% rename from GeoModelXml/src/ElementProcessor.cxx rename to GeoModelXml/GeoModelXml/src/ElementProcessor.cxx diff --git a/GeoModelXml/src/Gmx2Geo.cxx b/GeoModelXml/GeoModelXml/src/Gmx2Geo.cxx similarity index 100% rename from GeoModelXml/src/Gmx2Geo.cxx rename to GeoModelXml/GeoModelXml/src/Gmx2Geo.cxx diff --git a/GeoModelXml/src/GmxInterface.cxx b/GeoModelXml/GeoModelXml/src/GmxInterface.cxx similarity index 100% rename from GeoModelXml/src/GmxInterface.cxx rename to GeoModelXml/GeoModelXml/src/GmxInterface.cxx diff --git a/GeoModelXml/src/GmxUtil.cxx b/GeoModelXml/GeoModelXml/src/GmxUtil.cxx similarity index 100% rename from GeoModelXml/src/GmxUtil.cxx rename to GeoModelXml/GeoModelXml/src/GmxUtil.cxx diff --git a/GeoModelXml/src/IndexProcessor.cxx b/GeoModelXml/GeoModelXml/src/IndexProcessor.cxx similarity index 100% rename from GeoModelXml/src/IndexProcessor.cxx rename to GeoModelXml/GeoModelXml/src/IndexProcessor.cxx diff --git a/GeoModelXml/src/LogvolProcessor.cxx b/GeoModelXml/GeoModelXml/src/LogvolProcessor.cxx similarity index 100% rename from GeoModelXml/src/LogvolProcessor.cxx rename to GeoModelXml/GeoModelXml/src/LogvolProcessor.cxx diff --git a/GeoModelXml/src/LogvolrefProcessor.cxx b/GeoModelXml/GeoModelXml/src/LogvolrefProcessor.cxx similarity index 100% rename from GeoModelXml/src/LogvolrefProcessor.cxx rename to GeoModelXml/GeoModelXml/src/LogvolrefProcessor.cxx diff --git a/GeoModelXml/src/MakeBox.cxx b/GeoModelXml/GeoModelXml/src/MakeBox.cxx similarity index 100% rename from GeoModelXml/src/MakeBox.cxx rename to GeoModelXml/GeoModelXml/src/MakeBox.cxx diff --git a/GeoModelXml/src/MakeCons.cxx b/GeoModelXml/GeoModelXml/src/MakeCons.cxx similarity index 100% rename from GeoModelXml/src/MakeCons.cxx rename to GeoModelXml/GeoModelXml/src/MakeCons.cxx diff --git a/GeoModelXml/src/MakeElement.cxx b/GeoModelXml/GeoModelXml/src/MakeElement.cxx similarity index 100% rename from GeoModelXml/src/MakeElement.cxx rename to GeoModelXml/GeoModelXml/src/MakeElement.cxx diff --git a/GeoModelXml/src/MakeGenericTrap.cxx b/GeoModelXml/GeoModelXml/src/MakeGenericTrap.cxx similarity index 100% rename from GeoModelXml/src/MakeGenericTrap.cxx rename to GeoModelXml/GeoModelXml/src/MakeGenericTrap.cxx diff --git a/GeoModelXml/src/MakeIntersection.cxx b/GeoModelXml/GeoModelXml/src/MakeIntersection.cxx similarity index 100% rename from GeoModelXml/src/MakeIntersection.cxx rename to GeoModelXml/GeoModelXml/src/MakeIntersection.cxx diff --git a/GeoModelXml/src/MakeMaterial.cxx b/GeoModelXml/GeoModelXml/src/MakeMaterial.cxx similarity index 100% rename from GeoModelXml/src/MakeMaterial.cxx rename to GeoModelXml/GeoModelXml/src/MakeMaterial.cxx diff --git a/GeoModelXml/src/MakePara.cxx b/GeoModelXml/GeoModelXml/src/MakePara.cxx similarity index 100% rename from GeoModelXml/src/MakePara.cxx rename to GeoModelXml/GeoModelXml/src/MakePara.cxx diff --git a/GeoModelXml/src/MakePcon.cxx b/GeoModelXml/GeoModelXml/src/MakePcon.cxx similarity index 100% rename from GeoModelXml/src/MakePcon.cxx rename to GeoModelXml/GeoModelXml/src/MakePcon.cxx diff --git a/GeoModelXml/src/MakePgon.cxx b/GeoModelXml/GeoModelXml/src/MakePgon.cxx similarity index 100% rename from GeoModelXml/src/MakePgon.cxx rename to GeoModelXml/GeoModelXml/src/MakePgon.cxx diff --git a/GeoModelXml/src/MakeRotation.cxx b/GeoModelXml/GeoModelXml/src/MakeRotation.cxx similarity index 100% rename from GeoModelXml/src/MakeRotation.cxx rename to GeoModelXml/GeoModelXml/src/MakeRotation.cxx diff --git a/GeoModelXml/src/MakeShaperef.cxx b/GeoModelXml/GeoModelXml/src/MakeShaperef.cxx similarity index 100% rename from GeoModelXml/src/MakeShaperef.cxx rename to GeoModelXml/GeoModelXml/src/MakeShaperef.cxx diff --git a/GeoModelXml/src/MakeSimplePolygonBrep.cxx b/GeoModelXml/GeoModelXml/src/MakeSimplePolygonBrep.cxx similarity index 100% rename from GeoModelXml/src/MakeSimplePolygonBrep.cxx rename to GeoModelXml/GeoModelXml/src/MakeSimplePolygonBrep.cxx diff --git a/GeoModelXml/src/MakeSubtraction.cxx b/GeoModelXml/GeoModelXml/src/MakeSubtraction.cxx similarity index 100% rename from GeoModelXml/src/MakeSubtraction.cxx rename to GeoModelXml/GeoModelXml/src/MakeSubtraction.cxx diff --git a/GeoModelXml/src/MakeTransformation.cxx b/GeoModelXml/GeoModelXml/src/MakeTransformation.cxx similarity index 100% rename from GeoModelXml/src/MakeTransformation.cxx rename to GeoModelXml/GeoModelXml/src/MakeTransformation.cxx diff --git a/GeoModelXml/src/MakeTransformationref.cxx b/GeoModelXml/GeoModelXml/src/MakeTransformationref.cxx similarity index 100% rename from GeoModelXml/src/MakeTransformationref.cxx rename to GeoModelXml/GeoModelXml/src/MakeTransformationref.cxx diff --git a/GeoModelXml/src/MakeTranslation.cxx b/GeoModelXml/GeoModelXml/src/MakeTranslation.cxx similarity index 100% rename from GeoModelXml/src/MakeTranslation.cxx rename to GeoModelXml/GeoModelXml/src/MakeTranslation.cxx diff --git a/GeoModelXml/src/MakeTrap.cxx b/GeoModelXml/GeoModelXml/src/MakeTrap.cxx similarity index 100% rename from GeoModelXml/src/MakeTrap.cxx rename to GeoModelXml/GeoModelXml/src/MakeTrap.cxx diff --git a/GeoModelXml/src/MakeTrd.cxx b/GeoModelXml/GeoModelXml/src/MakeTrd.cxx similarity index 100% rename from GeoModelXml/src/MakeTrd.cxx rename to GeoModelXml/GeoModelXml/src/MakeTrd.cxx diff --git a/GeoModelXml/src/MakeTube.cxx b/GeoModelXml/GeoModelXml/src/MakeTube.cxx similarity index 100% rename from GeoModelXml/src/MakeTube.cxx rename to GeoModelXml/GeoModelXml/src/MakeTube.cxx diff --git a/GeoModelXml/src/MakeTubs.cxx b/GeoModelXml/GeoModelXml/src/MakeTubs.cxx similarity index 100% rename from GeoModelXml/src/MakeTubs.cxx rename to GeoModelXml/GeoModelXml/src/MakeTubs.cxx diff --git a/GeoModelXml/src/MakeUnion.cxx b/GeoModelXml/GeoModelXml/src/MakeUnion.cxx similarity index 100% rename from GeoModelXml/src/MakeUnion.cxx rename to GeoModelXml/GeoModelXml/src/MakeUnion.cxx diff --git a/GeoModelXml/src/MulticopyProcessor.cxx b/GeoModelXml/GeoModelXml/src/MulticopyProcessor.cxx similarity index 100% rename from GeoModelXml/src/MulticopyProcessor.cxx rename to GeoModelXml/GeoModelXml/src/MulticopyProcessor.cxx diff --git a/GeoModelXml/src/PositionIndex.cxx b/GeoModelXml/GeoModelXml/src/PositionIndex.cxx similarity index 100% rename from GeoModelXml/src/PositionIndex.cxx rename to GeoModelXml/GeoModelXml/src/PositionIndex.cxx diff --git a/GeoModelXml/src/ProcessorRegistry.cxx b/GeoModelXml/GeoModelXml/src/ProcessorRegistry.cxx similarity index 100% rename from GeoModelXml/src/ProcessorRegistry.cxx rename to GeoModelXml/GeoModelXml/src/ProcessorRegistry.cxx diff --git a/GeoModelXml/src/StrictErrorHandler.cxx b/GeoModelXml/GeoModelXml/src/StrictErrorHandler.cxx similarity index 100% rename from GeoModelXml/src/StrictErrorHandler.cxx rename to GeoModelXml/GeoModelXml/src/StrictErrorHandler.cxx diff --git a/GeoModelXml/src/TransformProcessor.cxx b/GeoModelXml/GeoModelXml/src/TransformProcessor.cxx similarity index 100% rename from GeoModelXml/src/TransformProcessor.cxx rename to GeoModelXml/GeoModelXml/src/TransformProcessor.cxx diff --git a/GeoModelXml/src/TransformrefProcessor.cxx b/GeoModelXml/GeoModelXml/src/TransformrefProcessor.cxx similarity index 100% rename from GeoModelXml/src/TransformrefProcessor.cxx rename to GeoModelXml/GeoModelXml/src/TransformrefProcessor.cxx diff --git a/GeoModelXml/src/createdomdocument.cxx b/GeoModelXml/GeoModelXml/src/createdomdocument.cxx similarity index 100% rename from GeoModelXml/src/createdomdocument.cxx rename to GeoModelXml/GeoModelXml/src/createdomdocument.cxx diff --git a/GeoModelXml/src/decompress.cxx b/GeoModelXml/GeoModelXml/src/decompress.cxx similarity index 100% rename from GeoModelXml/src/decompress.cxx rename to GeoModelXml/GeoModelXml/src/decompress.cxx diff --git a/README.md b/GeoModelXml/README.md similarity index 100% rename from README.md rename to GeoModelXml/README.md diff --git a/cmake/GMXConfig.cmake b/GeoModelXml/cmake/GMXConfig.cmake similarity index 100% rename from cmake/GMXConfig.cmake rename to GeoModelXml/cmake/GMXConfig.cmake diff --git a/data/example1.xml b/GeoModelXml/data/example1.xml similarity index 100% rename from data/example1.xml rename to GeoModelXml/data/example1.xml diff --git a/data/example2.xml b/GeoModelXml/data/example2.xml similarity index 100% rename from data/example2.xml rename to GeoModelXml/data/example2.xml diff --git a/data/example3.xml b/GeoModelXml/data/example3.xml similarity index 100% rename from data/example3.xml rename to GeoModelXml/data/example3.xml diff --git a/GeoModelXml/data/geomodel.dtd b/GeoModelXml/data/geomodel.dtd index 54cf5c59d9012e4dc64979e0f957d879f805f17a..e0b0d314610b42f658d0c2bb244623168af97ea5 100644 --- a/GeoModelXml/data/geomodel.dtd +++ b/GeoModelXml/data/geomodel.dtd @@ -65,9 +65,15 @@ <!ELEMENT addindex EMPTY> <!ATTLIST addindex name ID #REQUIRED> - <!ELEMENT shapes ((box|cons|generictrap|para|pcon|pgon|trap|tube|tubs|trd|intersection|subtraction|union)+)> + <!ELEMENT shapes ((box|cons|generictrap|para|pcon|pgon|trap|tube|tubs|trd|intersection|subtraction|union|simplepolygonbrep)+)> <!-- All shapes allowed in GeoModel manual. Same name, parameters, parameter order, but always lower case --> + <!ELEMENT simplepolygonbrep EMPTY> + <!ATTLIST simplepolygonbrep name ID #REQUIRED + xpoints CDATA #REQUIRED + ypoints CDATA #REQUIRED + zhalflength CDATA #REQUIRED> + <!ELEMENT box EMPTY> <!ATTLIST box name ID #REQUIRED xhalflength CDATA #REQUIRED diff --git a/data/gmexMatVisAttributes.json b/GeoModelXml/data/gmexMatVisAttributes.json similarity index 100% rename from data/gmexMatVisAttributes.json rename to GeoModelXml/data/gmexMatVisAttributes.json diff --git a/data/materials.gmx b/GeoModelXml/data/materials.gmx similarity index 100% rename from data/materials.gmx rename to GeoModelXml/data/materials.gmx