updated toolchain.cmake taking into account it should work for the inner Geant4 too

toolchain.cmake

@@ -5,12 +5,17 @@ set(heptools_version 84)
 # compiler (without the proper cache)
 if(NOT CMAKE_SOURCE_DIR MATCHES "CMakeTmp")
 
-  find_file(default_toolchain NAMES GaudiDefaultToolchain.cmake
+  find_file(toolchain_macros NAMES GaudiToolchainMacros.cmake
             HINTS ${CMAKE_SOURCE_DIR}/cmake)
-  if(default_toolchain)
-    include(${default_toolchain})
+  if(toolchain_macros)
+    get_filename_component(gaudi_modules_dir "${toolchain_macros}" PATH)
+    set(CMAKE_MODULE_PATH ${gaudi_modules_dir} ${CMAKE_MODULE_PATH})
+    include(GaudiToolchainMacros)
+    init()
+    include(UseHEPTools)
+    use_heptools(${heptools_version})
   else()
-    message(FATAL_ERROR "Cannot find GaudiDefaultToolchain.cmake")
+    message(FATAL_ERROR "Cannot find GaudiToolchainMacros.cmake")
   endif()
 
 endif()