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

CI: Fix use of the built-in XercesC build.

parent 0f8ffeac
No related branches found
No related tags found
1 merge request!2CI: set Ubuntu and macOS pipelines for the new monorepo
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# Configuration option for how "nlohmann_json" should be used. # Configuration option for how "nlohmann_json" should be used.
option( GEOMODEL_USE_BUILTIN_JSON option( GEOMODEL_USE_BUILTIN_JSON
"Download a version of nlohmann_json during the build" FALSE ) "Download and compile a version of nlohmann_json during the build" FALSE )
# Now do what was requested. # Now do what was requested.
if( GEOMODEL_USE_BUILTIN_JSON ) if( GEOMODEL_USE_BUILTIN_JSON )
......
...@@ -14,6 +14,13 @@ if( GEOMODEL_USE_BUILTIN_XERCESC ) ...@@ -14,6 +14,13 @@ if( GEOMODEL_USE_BUILTIN_XERCESC )
# Tell the user what's happening. # Tell the user what's happening.
message( STATUS "Building XercesC as part of the project" ) message( STATUS "Building XercesC as part of the project" )
# Tell the user what's happening.
if( COLOR_DEFS )
message( STATUS "${BoldMagenta}'GEOMODEL_USE_BUILTIN_XERCESC' was set to 'true' ==> Building XercesC as part of the project${ColourReset}" )
else()
message( STATUS "'GEOMODEL_USE_BUILTIN_XERCESC' was set to 'true' ==> Building XercesC as part of the project" )
endif()
# The include directory and library that will be produced. # The include directory and library that will be produced.
set( XercesC_INCLUDE_DIR set( XercesC_INCLUDE_DIR
"${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/XercesCInstall/${CMAKE_INSTALL_INCLUDEDIR}" ) "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/XercesCInstall/${CMAKE_INSTALL_INCLUDEDIR}" )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment