From a2f0b367d446157f1a9ce6f61e2e4ff890f8dfd1 Mon Sep 17 00:00:00 2001
From: Riccardo Maria Bianchi <riccardo.maria.bianchi@cern.ch>
Date: Mon, 26 Apr 2021 17:18:05 +0200
Subject: [PATCH] Fix GeoModelXML installation

---
 GeoModelTools/CMakeLists.txt                         | 1 +
 GeoModelTools/GeoModelXML/GMXPlugin/CMakeLists.txt   | 8 +++-----
 GeoModelTools/GeoModelXML/GeoModelXml/CMakeLists.txt | 7 ++-----
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/GeoModelTools/CMakeLists.txt b/GeoModelTools/CMakeLists.txt
index 4b37b9c10..3c29cb7ad 100644
--- a/GeoModelTools/CMakeLists.txt
+++ b/GeoModelTools/CMakeLists.txt
@@ -48,6 +48,7 @@ endif()
 include( GNUInstallDirs )
 
 # Set up the build of the libraries of the project.
+add_subdirectory( GeoModelXML )
 add_subdirectory( GeoModelXMLParser )
 add_subdirectory( GeoModelJSONParser )
 add_subdirectory( ExpressionEvaluator )
diff --git a/GeoModelTools/GeoModelXML/GMXPlugin/CMakeLists.txt b/GeoModelTools/GeoModelXML/GMXPlugin/CMakeLists.txt
index a0589d21b..feb43ae86 100644
--- a/GeoModelTools/GeoModelXML/GMXPlugin/CMakeLists.txt
+++ b/GeoModelTools/GeoModelXML/GMXPlugin/CMakeLists.txt
@@ -4,10 +4,8 @@
 file( GLOB SOURCES src/*.cxx )
 
 # External dependencies
-find_package( GeoModelCore REQUIRED )
-find_package( GeoModelTools REQUIRED )
-find_package( XercesC REQUIRED )
-find_package( ZLIB REQUIRED )
+#find_package( XercesC REQUIRED )
+#find_package( ZLIB REQUIRED )
 
 
 # Create the library.
@@ -24,7 +22,7 @@ set_target_properties( GMXPlugin PROPERTIES
 
 # Set up an alias with the same name that you would get by "finding" a pre-built
 # version of the library.
-add_library( GeoModelXML::GMXPlugin ALIAS GMXPlugin )
+add_library( GeoModelTools::GMXPlugin ALIAS GMXPlugin )
 
 # Install the library.
 install(TARGETS GMXPlugin
diff --git a/GeoModelTools/GeoModelXML/GeoModelXml/CMakeLists.txt b/GeoModelTools/GeoModelXML/GeoModelXml/CMakeLists.txt
index c3583c93b..564e2a906 100644
--- a/GeoModelTools/GeoModelXML/GeoModelXml/CMakeLists.txt
+++ b/GeoModelTools/GeoModelXML/GeoModelXml/CMakeLists.txt
@@ -6,10 +6,7 @@ file( GLOB HEADERS GeoModelXml/*.h )
 file( GLOB SHAPEHEADERS GeoModelXml/shape/*.h )
 
 # External dependencies
-find_package( GeoModelCore REQUIRED )
-find_package( Eigen3 REQUIRED )
-find_package( GeoModelTools REQUIRED )
-find_package( XercesC REQUIRED )
+#find_package( Eigen3 REQUIRED )
 find_package( ZLIB REQUIRED )
 
 
@@ -28,7 +25,7 @@ set_target_properties( GeoModelXml PROPERTIES
 
 # Set up an alias with the same name that you would get by "finding" a pre-built
 # version of the library.
-add_library( GeoModelXML::GeoModelXml ALIAS GeoModelXml )
+add_library( GeoModelTools::GeoModelXml ALIAS GeoModelXml )
 
 # Install the library.
 install(TARGETS GeoModelXml
-- 
GitLab