Some added protections

diff --git a/cmake/modules/ALICEMacros.cmake b/cmake/modules/ALICEMacros.cmake
index 96caee63b2b4c9fca56afaa1c27fc6eb648e5e9a..1f9d3c3e2353dc82b6e22c3bdbc1972e3609dc16 100644 (file)
--- a/cmake/modules/ALICEMacros.cmake
+++ b/cmake/modules/ALICEMacros.cmake
@@ -69,7 +69,7 @@ Function (AddLibrary LIB SRCS DHDRS)
     Set(ASRCS ${SRCS} ${DICT})
     Root_Generate_Dictionary("${DHDRS}" "${LDEF}" "${DICT}" "${INCLUDE_DIRECTORIES}")
   Else(LDEF)
-    Message(STATUS "${LIB}LinkDef.h not found... probably building empty lib")
+    Message(STATUS "No ${LIB}LinkDef.h found... building lib with no ROOT dict")
     Set(ASRCS ${SRCS})
   Endif(LDEF)
 

diff --git a/cmake/modules/FindROOT.cmake b/cmake/modules/FindROOT.cmake
index 74b47e23dba45d9c664ee7b1b8c8cffef07ee6e5..5f551648e5a86a51b6c8734f81158d32a11e5be5 100644 (file)
--- a/cmake/modules/FindROOT.cmake
+++ b/cmake/modules/FindROOT.cmake
@@ -27,19 +27,43 @@ Else (${ROOT_CONFIG} MATCHES "ROOT_CONFIG-NOTFOUND")
     COMMAND root-config --f77 
     OUTPUT_VARIABLE _f77 
     OUTPUT_STRIP_TRAILING_WHITESPACE)
-  Set(ENV{F77} ${_f77})
+  If(APPLE)
+    Execute_process(
+      COMMAND which ${_f77}
+      OUTPUT_VARIABLE _f77path
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+    Set(ENV{F77} ${_f77path})
+  Else(APPLE)
+    Set(ENV{F77} ${_f77})
+  Endif(APPLE)
 
   Execute_process(
     COMMAND root-config --cc
     OUTPUT_VARIABLE _cc 
     OUTPUT_STRIP_TRAILING_WHITESPACE)
-  Set(ENV{CC} ${_cc})
+  If(APPLE)
+    Execute_process(
+      COMMAND which ${_cc}
+      OUTPUT_VARIABLE _ccpath
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+    Set(ENV{CC} ${_ccpath})
+  Else(APPLE)
+    Set(ENV{CC} ${_cc})
+  Endif(APPLE)
 
   Execute_process(
     COMMAND root-config --cxx
     OUTPUT_VARIABLE _cxx
     OUTPUT_STRIP_TRAILING_WHITESPACE)
-  Set(ENV{CXX} ${_cxx})
+  If(APPLE)
+    Execute_process(
+      COMMAND which ${_cxx}
+      OUTPUT_VARIABLE _cxxpath
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+    Set(ENV{CXX} ${_cxxpath})
+  Else(APPLE)
+    Set(ENV{CXX} ${_cxx})
+  Endif(APPLE)
 
   Execute_process(
     COMMAND root-config --version