Index: trunk/FACT++/CMakeLists.txt
===================================================================
--- trunk/FACT++/CMakeLists.txt	(revision 19836)
+++ trunk/FACT++/CMakeLists.txt	(revision 19839)
@@ -278,18 +278,31 @@
    ENDIF()
 
-   IF(ROOTSYS AND NOT ROOTSYS STREQUAL $ENV{ROOTSYS})
+   # Is this is a local or a global installation?
+   IF(ENV{ROOTSYS})
+      IF(ROOTSYS AND NOT ROOTSYS STREQUAL "$ENV{ROOTSYS}")
+         MESSAGE(WARNING
+            " \n"
+            " ROOT Location changed!\n"
+            " Present  ROOTSYS: $ENV{ROOTSYS}\n"
+            " Previous ROOTSYS: ${ROOTSYS}")
+         FILE(REMOVE thisroot.sh)
+      ENDIF()
+
+      SET(ROOTSYS $ENV{ROOTSYS} CACHE INTERNAL "Internal variable to check for consistency in ROOTSYS")
+
+      # For convenience and easy tracking
+      ADD_CUSTOM_COMMAND(OUTPUT thisroot.sh COMMAND ln -sf ${ROOTSYS}/bin/thisroot.sh VERBATIM)
+      ADD_CUSTOM_TARGET(thisroot ALL DEPENDS thisroot.sh)
+   ENDIF()
+
+   IF(ROOTVER AND NOT ROOTVER VERSION_EQUAL ROOT_VERSION)
       MESSAGE(WARNING
          " \n"
          " ROOT Version changed!\n"
-         " Present  ROOTSYS: $ENV{ROOTSYS}\n"
-         " Previous ROOTSYS: ${ROOTSYS}")
-      FILE(REMOVE thisroot.sh)
+         " Present:  ${ROOT_VERSION}\n"
+         " Previous: ${ROOTVER}")
    ENDIF()
 
-   SET(ROOTSYS $ENV{ROOTSYS} CACHE INTERNAL "Internal variable to check for consistency in ROOTSYS")
-
-   # For convenience and easy tracking
-   ADD_CUSTOM_COMMAND(OUTPUT thisroot.sh COMMAND ln -sf ${ROOTSYS}/bin/thisroot.sh VERBATIM)
-   ADD_CUSTOM_TARGET(thisroot ALL DEPENDS thisroot.sh)
+   SET(ROOTVER ${ROOT_VERSION} CACHE INTERNAL "Internal variable to check for consistency of root version")
 
 ENDIF(NOT NO_ROOT AND NOT VIEWER_ONLY)