Import Geant4 10.0.0 source tree

cmake/Modules/FindROOT.cmake

@@ -8,7 +8,7 @@
 
 
 find_program(ROOT_CONFIG_EXECUTABLE root-config
-  PATHS $ENV{ROOTSYS}/bin)
+  PATHS ${ROOTSYS}/bin $ENV{ROOTSYS}/bin)
 
 if(NOT ROOT_CONFIG_EXECUTABLE)
   set(ROOT_FOUND FALSE)
@@ -80,10 +80,15 @@ function(ROOT_GENERATE_DICTIONARY dictionary)
     endif()
   endforeach()
   #---Get the list of include directories------------------
+  # Filter out UNIX system directory to workaround bug in
+  # rootcint (info from Andrea Dotti, and info from post:
+  # http://root.cern.ch/phpBB3/viewtopic.php?f=3&t=15086
   get_directory_property(incdirs INCLUDE_DIRECTORIES)
   set(includedirs) 
-  foreach( d ${incdirs})    
-   set(includedirs ${includedirs} -I${d})
+  foreach( d ${incdirs})
+    if(NOT ${d} STREQUAL "/usr/include")
+     set(includedirs ${includedirs} -I${d})
+    endif()
   endforeach()
   #---Get LinkDef.h file------------------------------------
   set(linkdefs)
@@ -141,12 +146,13 @@ function(REFLEX_GENERATE_DICTIONARY dictionary)
   foreach( d ${defs})    
    set(definitions ${definitions} -D${d})
   endforeach()
-  #---Nanes and others---------------------------------------
+  #---Names and others---------------------------------------
   set(gensrcdict ${dictionary}.cpp)
   if(MSVC)
     set(gccxmlopts "--gccxmlopt=\"--gccxml-compiler cl\"")
+  elseif(APPLE)
+    set(gccxmlopts "--gccxmlopt=--gccxml-compiler g++ ")
   else()
-    #set(gccxmlopts "--gccxmlopt=\'--gccxml-cxxflags -m64 \'")
     set(gccxmlopts)
   endif()  
   #set(rootmapname ${dictionary}Dict.rootmap)