Minor fixes

CMakeLists.txt

 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5)
 
-# NO_NINJA : Geant4 build fails with Ninja
-
 set(GEANT4_SRCS_REPOSITORY https://gitlab.cern.ch/lhcb/Geant4-srcs.git CACHE STRING "Repository for Geant4 sources")
 set(GEANT4FILES_VERSION v106r1 CACHE STRING "Version for Geant4Files to match Geant4-src version")
 

Geant4/G4config/CMakeLists.txt

@@ -57,7 +57,7 @@ ExternalProject_Add(Geant4
               -DGEANT4_USE_NETWORKVRML=ON
               -DGEANT4_USE_NETWORKDAWN=ON
               -DGEANT4_USE_INVENTOR=OFF
-              -DCMAKE_INSTALL_PREFIX=${CMAKE_SOURCE_DIR}/InstallArea/$ENV{CMTCONFIG}
+              -DCMAKE_INSTALL_PREFIX=${CMAKE_SOURCE_DIR}/InstallArea/${BINARY_TAG}
               -DCMAKE_INSTALL_LIBDIR=lib
               -DGEANT4_INSTALL_DATADIR=${G4DATA}
               -DGEANT4_BUILD_VERBOSE_CODE=${G4VERBOSE}

toolchain.cmake

@@ -23,7 +23,8 @@ if(NOT CMAKE_SOURCE_DIR MATCHES "CMakeTmp")
     # - ninja (it requires LD_LIBRARY_PATH set to run)
     # - Gaudi (we do not want to use it from LCG)
     # - xenv (conflicts with the version in the build environment)
-    list(FILTER CMAKE_PREFIX_PATH EXCLUDE REGEX "(LCG_|lcg/nightlies).*(ninja|Gaudi|xenv)")
+    # - git (requires a special environment provided only by LCG views)
+    list(FILTER CMAKE_PREFIX_PATH EXCLUDE REGEX "(LCG_|lcg/nightlies).*(ninja|Gaudi|xenv|git)/")
   endif()
 
 endif()