From 121728de5af776b4503faca5e21fb507c24e481e Mon Sep 17 00:00:00 2001
From: Marko Petric <marko.petric@cern.ch>
Date: Wed, 10 Jul 2019 16:06:16 +0200
Subject: [PATCH] Add Boost_NO_BOOST_CMAKE=ON to Mac CI
---
.gitlab-ci.yml | 4 ++--
examples/CMakeLists.txt | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c704e58a3..6fa96c9bb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -140,7 +140,7 @@ mac1014-clang100-Geant10.5:
- cd ../examples/
- mkdir build
- cd build
- - cmake -GNinja ..
+ - cmake -DBoost_NO_BOOST_CMAKE=ON -GNinja ..
- ninja
- ninja install
- ctest --output-on-failure
@@ -161,7 +161,7 @@ mac1014-clang100-Geant10.5-XERCESC:
- cd ../examples/
- mkdir build
- cd build
- - cmake -GNinja -DXERCESC_ROOT_DIR=${XercesC_HOME} ..
+ - cmake -GNinja -DBoost_NO_BOOST_CMAKE=ON -DXERCESC_ROOT_DIR=${XercesC_HOME} ..
- ninja
- ninja install
- ctest --output-on-failure
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 3dcffb0d1..7d862ed31 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -22,6 +22,9 @@
# M.Frank, CERN, 2015: Adapt to new cmake scripts
#==========================================================================
cmake_minimum_required(VERSION 3.3 FATAL_ERROR)
+if (POLICY CMP0074)
+ cmake_policy(SET CMP0074 NEW) # CMake 3.12
+endif ()
project( DD4hep_Examples )
--
GitLab