Skip to content
Snippets Groups Projects
Commit 2c5e5742 authored by Riccardo Maria Bianchi's avatar Riccardo Maria Bianchi :sunny:
Browse files

(cmake) update finding of Xerces and Json, according to the build options

parent 97cb68f6
No related branches found
No related tags found
1 merge request!60WIP: Add CC7 (Centos7) CI jobs
......@@ -33,8 +33,8 @@ set( CMAKE_FIND_FRAMEWORK "LAST" CACHE STRING
# Set up how the project handle some of its dependenices. Either by picking them
# up from the environment, or building them itself.
include( SetupEigen3 )
include( SetupXercesC )
include( SetupJSON )
#include( SetupXercesC )
#include( SetupJSON )
# Find the dependencies that the project always picks up from its environment.
find_package( SQLite3 3.7.17 )
......@@ -59,11 +59,14 @@ list( APPEND BUILT_PACKAGES "GeoModelIO")
if(GEOMODEL_BUILD_TOOLS)
include( SetupXercesC )
include( SetupJSON )
add_subdirectory(GeoModelTools)
list( APPEND BUILT_PACKAGES "GeoModelTools")
endif()
if(GEOMODEL_BUILD_VISUALIZATION)
include( SetupJSON )
add_subdirectory(GeoModelVisualization)
list( APPEND BUILT_PACKAGES "GeoModelVisualization")
endif()
......@@ -74,12 +77,15 @@ if(GEOMODEL_BUILD_EXAMPLES)
endif()
if(GEOMODEL_BUILD_FULLSIMLIGHT)
include( SetupXercesC )
include( SetupJSON )
set(GEOMODEL_BUILD_GEOMODELG4 TRUE) # FullSimLight needs GeoModelG4
add_subdirectory(FullSimLight)
list( APPEND BUILT_PACKAGES "FullSimLight")
endif()
if(GEOMODEL_BUILD_GEOMODELG4 OR GEOMODEL_BUILD_EXAMPLES_W_GEANT4)
include( SetupXercesC )
add_subdirectory(GeoModelG4)
list( APPEND BUILT_PACKAGES "GeoModelG4")
endif()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment