X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=cmake%2FFindROOT.cmake;h=a42adc690ade05d32c85b21b85c03b39c594c49b;hb=a6b1a9a304cd7dc84904463979496382c838f73e;hp=4945e41897557cf2e92cbcb335f29cfc3719aa79;hpb=89c1ed23b3b3baa6ccb3ec7217f3b952fdff0e45;p=u%2Fmrichter%2FAliRoot.git

diff --git a/cmake/FindROOT.cmake b/cmake/FindROOT.cmake
index 4945e418975..a42adc690ad 100644
--- a/cmake/FindROOT.cmake
+++ b/cmake/FindROOT.cmake
@@ -5,12 +5,14 @@
 
 cmake_minimum_required(VERSION 2.8.4 FATAL_ERROR)
 
-set(ROOTSYS $ENV{ROOTSYS} CACHE STRING "" FORCE)
-if(NOT ROOTSYS)
-  message(FATAL_ERROR "Environment variable $ROOTSYS is not set !")
-else()
-  get_filename_component(ROOTSYS "${ROOTSYS}" REALPATH)
-endif(NOT ROOTSYS)
+# We don't care if ROOTSYS environment variable is set or not - 
+# all we care about is that we can find root-config in our path
+# set(ROOTSYS $ENV{ROOTSYS} CACHE STRING "" FORCE)
+# if(NOT ROOTSYS)
+#   message(FATAL_ERROR "Environment variable $ROOTSYS is not set !")
+# else()
+#   get_filename_component(ROOTSYS "${ROOTSYS}" REALPATH)
+# endif(NOT ROOTSYS)
 find_program(ROOT_CONFIG NAMES root-config)
 find_program(ROOTCINT NAMES rootcint)
 if(NOT ROOT_CONFIG)
@@ -29,11 +31,29 @@ if(ROOT_CONFIG AND ROOTCINT)
   ALICE_RootConfig(ROOTCLIBS --glibs)
   ALICE_RootConfig(ROOTHASALIEN --has-alien)
   ALICE_RootConfig(ROOTHASXML --has-xml)
-  set(ROOTCLIBS "${ROOTCLIBS} -lThread -lMinuit -lVMC -lEG -lGeom -lTreePlayer -lXMLIO -lXMLParser -lProof -lProofPlayer -lMLP -lSpectrum -L${ROOTPLUGDIR}" )
+  # ALICE_RootConfig(ROOTHASVC  --has-vc)
+#  set(ROOTCLIBS "${ROOTCLIBS} -lThread -lMinuit -lVMC -lEG -lGeom -lTreePlayer -lXMLIO -lXMLParser -lProof -lProofPlayer -lMLP -lSpectrum -L${ROOTPLUGDIR}" )
+  set(ROOTCLIBS "${ROOTCLIBS} -lThread -lMinuit -lVMC -lEG -lGeom -lTreePlayer -lXMLIO -lXMLParser -lProof -lProofPlayer -lMLP -lSpectrum" )
+  # if(${ROOTHASVC} STREQUAL "yes") 	
+  #   set(ROOTCLIBS "${ROOTCLIBS} -lVc")
+  # endif(${ROOTHASVC} STREQUAL "yes") 
   set(ROOTPLIBS $ENV{ROOTPLIBS})
+  if(NOT $ENV{ROOTSYS})
   message(STATUS "ROOTSYS directory : ${ROOTSYS}") 
+  else()
+    message(STATUS "ROOTSYS directory : not set - assume prefix build")
+  endif(NOT $ENV{ROOTSYS})
   message(STATUS "ROOT include directory: ${ROOTINCDIR}")
   message(STATUS "ROOT library directory: ${ROOTLIBDIR}")
+  # message(STATUS "ROOT libraries: ${ROOTCLIBS}")
+  # message(STATUS "ROOT has Vc: ${ROOTHASVC}")
+  # message(STATUS "ROOT has XML: ${ROOTHASXML}")
+  set(ROOT6_ALPHA "5.99.1")
+  string(REGEX REPLACE "/0*" "." ROOT_DOTVERSION ${ROOT_VERSION})
+  if(ROOT_DOTVERSION VERSION_GREATER ROOT6_ALPHA)
+    message(WARNING 
+      "Compling and linking against ROOT6 alpha is highly experimental")
+  endif(ROOT_DOTVERSION VERSION_GREATER ROOT6_ALPHA)
 else()
   message(FATAL_ERROR "rootcint not found ! Please check your ROOT installation.")
 endif(ROOT_CONFIG AND ROOTCINT)