Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
GeoModel
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GeoModelDev
GeoModel
Commits
2c5e5742
Commit
2c5e5742
authored
4 years ago
by
Riccardo Maria Bianchi
Browse files
Options
Downloads
Patches
Plain Diff
(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
!60
WIP: Add CC7 (Centos7) CI jobs
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMakeLists.txt
+8
-2
8 additions, 2 deletions
CMakeLists.txt
with
8 additions
and
2 deletions
CMakeLists.txt
+
8
−
2
View file @
2c5e5742
...
...
@@ -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
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment