From 98e12cc256178896572044133fb58d076f0c98d6 Mon Sep 17 00:00:00 2001 From: Markus Frank <Markus.Frank@cern.ch> Date: Thu, 5 Apr 2018 12:18:46 +0200 Subject: [PATCH] Merge DDCMS and DDCMSTests --- etc/CompileAllOptionPermutations.sh | 1 + examples/CMakeLists.txt | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/etc/CompileAllOptionPermutations.sh b/etc/CompileAllOptionPermutations.sh index ff15ab257..1d3ca3e19 100755 --- a/etc/CompileAllOptionPermutations.sh +++ b/etc/CompileAllOptionPermutations.sh @@ -15,6 +15,7 @@ INSTALL_G4=${SW}/g4_${GEANT_VERSION}_dbg/lib/Geant4-10.3.2; #ROOT_VERSION=6.06.06; ROOT_VERSION=6.08.00; ROOT_VERSION=6.10.04; +ROOT_VERSION=6.12.06; source ${INSTALL_G4}/../../bin/geant4.sh; num_threads=2 # diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 9ce85bcc2..334574fb3 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -43,9 +43,6 @@ dd4hep_package ( dd4hepExample MAJOR 0 MINOR 15 PATCH 0 [dd4hep REQUIRED COMPONENTS DDCore] ) # - -add_subdirectory(DDCMS) - dd4hep_enable_tests ( CLICSiD LHeD -- GitLab