Changeset 19837

Timestamp:

10/30/19 18:32:33 (5 years ago)

Author:

tbretz

Message:

This did not work for system wide installations... new try.

File:

• trunk/Mars/CMakeLists.txt (modified) (2 diffs)

trunk/Mars/CMakeLists.txt

@@ -37 +37 @@
 STRING(TIMESTAMP VERSION %y.%U.%w.%H UTC)
 
+MESSAGE(STATUS "Cmake V${CMAKE_VERSION}")
 MESSAGE(STATUS "Mars V${VERSION}")
 
@@ -184 +185 @@
 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 ROOTVER STREQUAL ROOT_VERSION)
    MESSAGE(WARNING
       " \n"
       " ROOT Version 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)
+      " Present  ${ROOT_VERSION}\n"
+      " Previous ${ROOT_VER}")
+ENDIF()
+
+SET(ROOTVER ROOT_VERSION CACHE INTERNAL "Internal variable to check for consistency of root version")
 
 # -lGui -lCore -lCint -lRIO -lNet -lHist -lGraf -lGraf3d -lGpad -lTree