From b627fcf62a6ecf5f63ad08597b34cc3498133e1d Mon Sep 17 00:00:00 2001
From: Riccardo Maria Bianchi <riccardo.maria.bianchi@cern.ch>
Date: Tue, 30 Jun 2020 09:39:55 +0200
Subject: [PATCH] CI: Fix use of the built-in XercesC build.
---
dependencies/SetupJSON.cmake | 2 +-
dependencies/SetupXercesC.cmake | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/dependencies/SetupJSON.cmake b/dependencies/SetupJSON.cmake
index bf72b2f4e..e97dde92f 100644
--- a/dependencies/SetupJSON.cmake
+++ b/dependencies/SetupJSON.cmake
@@ -7,7 +7,7 @@
# Configuration option for how "nlohmann_json" should be used.
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.
if( GEOMODEL_USE_BUILTIN_JSON )
diff --git a/dependencies/SetupXercesC.cmake b/dependencies/SetupXercesC.cmake
index 1d86524f0..12588e592 100644
--- a/dependencies/SetupXercesC.cmake
+++ b/dependencies/SetupXercesC.cmake
@@ -14,6 +14,13 @@ if( GEOMODEL_USE_BUILTIN_XERCESC )
# Tell the user what's happening.
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.
set( XercesC_INCLUDE_DIR
"${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/XercesCInstall/${CMAKE_INSTALL_INCLUDEDIR}" )
--
GitLab