diff --git a/GeoModelTools/CMakeLists.txt b/GeoModelTools/CMakeLists.txt index 4b37b9c10258c341ccbf4fffda443456d8b0db3f..3c29cb7ad5912aa19e24997da70da49269d0bd1c 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 a0589d21b7a9f7b5081aa78bdb26dfa685b35c64..feb43ae86874ed149e327a7d167f3b44ccf3b600 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 c3583c93bd9f8b2cd79919ee61dcdd033bfe6d2f..564e2a906349e978c513a1abe5721205543e3c1d 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