fixed root cmake lookup

diff --git a/cmake/FindROOT.cmake1 b/cmake/FindROOT.cmake
similarity index 94%
rename from cmake/FindROOT.cmake1
rename to cmake/FindROOT.cmake
index d01b212a6751eb0b34e49149d3166026bacf7f67..db14f988662d855e6bd8a44129ad86137f2aa6e2 100644 (file)
--- a/cmake/FindROOT.cmake1
+++ b/cmake/FindROOT.cmake
@@ -8,30 +8,22 @@
 # This module defines a number of key variables and macros.
 
 
-MESSAGE("Looking for Root...")
 MESSAGE(STATUS "Looking for Root...")
 
-SET(ROOT_CONFIG_SEARCHPATH
-  ${SIMPATH}/tools/root/bin
-  $ENV{ROOTSYS}/bin
-)
-
 SET(ROOT_DEFINITIONS "")
 
 SET(ROOT_INSTALLED_VERSION_TOO_OLD FALSE)
 
 SET(ROOT_CONFIG_EXECUTABLE ROOT_CONFIG_EXECUTABLE-NOTFOUND)
 
-FIND_PROGRAM(ROOT_CONFIG_EXECUTABLE NAMES root-config PATHS
-   ${ROOT_CONFIG_SEARCHPATH}
-   NO_SYSTEM_ENVIRONMENT_PATH)
+FIND_PROGRAM(ROOT_CONFIG_EXECUTABLE NAMES root-config PATHS)
     
 IF (${ROOT_CONFIG_EXECUTABLE} MATCHES "ROOT_CONFIG_EXECUTABLE-NOTFOUND")
   MESSAGE( FATAL_ERROR "ROOT not installed in the searchpath and ROOTSYS is not set. Please
  set ROOTSYS or add the path to your ROOT installation in the Macro FindROOT.cmake in the
  subdirectory cmake/modules.")
 ELSE (${ROOT_CONFIG_EXECUTABLE} MATCHES "ROOT_CONFIG_EXECUTABLE-NOTFOUND")
-  MESSAGE("root-config found")
+               MESSAGE(STATUS "root-config found")
   STRING(REGEX REPLACE "(^.*)/bin/root-config" "\\1" test ${ROOT_CONFIG_EXECUTABLE}) 
   SET( ENV{ROOTSYS} ${test})
   set( ROOTSYS ${test})
@@ -47,9 +39,6 @@ IF (ROOT_CONFIG_EXECUTABLE)
   MESSAGE(STATUS "Looking for Root... - found $ENV{ROOTSYS}/bin/root")
   MESSAGE(STATUS "Looking for Root... - version ${ROOTVERSION} ")   
 
-  MESSAGE( "Looking for Root... - found $ENV{ROOTSYS}/bin/root")
-  MESSAGE( "Looking for Root... - version ${ROOTVERSION} ")   
-
   # we need at least version 5.00/00
   IF (NOT ROOT_MIN_VERSION)
     SET(ROOT_MIN_VERSION "5.00/00")
@@ -226,4 +215,4 @@ MACRO (ROOT_GENERATE_DICTIONARY INFILES LINKDEF_FILE OUTFILE INCLUDE_DIRS_IN)
 
 ENDMACRO (ROOT_GENERATE_DICTIONARY)
 
-#MESSAGE("la")
\ No newline at end of file
+#MESSAGE("la")

diff --git a/cmake/FindROOT.cmake2 b/cmake/FindROOT.cmake2
deleted file mode 100644 (file)
index 02b456a..0000000
--- a/cmake/FindROOT.cmake2
+++ /dev/null
@@ -1,225 +0,0 @@
-# - Find ROOT instalation # This module tries to find the ROOT installation on your system.
-# It tries to find the root-config script which gives you all the needed information.
-# If the system variable ROOTSYS is set this is straight forward.
-# If not the module uses the pathes given in ROOT_CONFIG_SEARCHPATH.
-# If you need an other path you should add this path to this varaible.  
-# The root-config script is then used to detect basically everything else.
-# This module defines a number of key variables and macros.
-
-
-MESSAGE(STATUS "Looking for Root...")
-
-SET(ROOT_CONFIG_SEARCHPATH
-  $ENV{ROOTSYS}/bin
-  )
-
-SET(ROOT_DEFINITIONS "")
-
-SET(ROOT_INSTALLED_VERSION_TOO_OLD FALSE)
-
-SET(ROOT_CONFIG_EXECUTABLE ROOT_CONFIG_EXECUTABLE-NOTFOUND)
-
-FIND_PROGRAM(ROOT_CONFIG_EXECUTABLE NAMES root-config PATHS
-  ${ROOT_CONFIG_SEARCHPATH}
-  NO_SYSTEM_ENVIRONMENT_PATH)
-
-FIND_FILE( RVERSION_H NAMES RVersion.h PATHS $ENV{ROOTSYS}/include )
-
-IF ( RVERSION_H )
-  FILE( READ ${RVERSION_H} RVERS_CONTENT )
-  STRING( REGEX MATCH "#define ROOT_RELEASE \"[^\n]+\"\n" _line "${RVERS_CONTENT}" )
-  STRING( REGEX REPLACE "#define ROOT_RELEASE \"([^\n]+)\"\n" "\\1" _match "${_line}")
-  IF(_match)
-    SET( ROOTVERSION ${_match})
-  ENDIF(_match)
-ENDIF( RVERSION_H )
-
-
-IF (ROOTVERSION)
-  
-  SET(ROOT_FOUND FALSE)
-
-  MESSAGE(STATUS "Looking for Root... - found $ENV{ROOTSYS}/bin/root")
-  MESSAGE(STATUS "Looking for Root... - version ${ROOTVERSION} ")   
-
-  # we need at least version 5.00/00
-  IF (NOT ROOT_MIN_VERSION)
-    SET(ROOT_MIN_VERSION "5.00/00")
-  ENDIF (NOT ROOT_MIN_VERSION)
-  
-  # now parse the parts of the user given version string into variables
-  STRING(REGEX REPLACE "^([0-9]+)\\.[0-9][0-9]+\\/[0-9][0-9]+" "\\1" req_root_major_vers "${ROOT_MIN_VERSION}")
-  STRING(REGEX REPLACE "^[0-9]+\\.([0-9][0-9])+\\/[0-9][0-9]+.*" "\\1" req_root_minor_vers "${ROOT_MIN_VERSION}")
-  STRING(REGEX REPLACE "^[0-9]+\\.[0-9][0-9]+\\/([0-9][0-9]+)" "\\1" req_root_patch_vers "${ROOT_MIN_VERSION}")
-  
-  # and now the version string given by qmake
-  STRING(REGEX REPLACE "^([0-9]+)\\.[0-9][0-9]+\\/[0-9][0-9]+.*" "\\1" found_root_major_vers "${ROOTVERSION}")
-  STRING(REGEX REPLACE "^[0-9]+\\.([0-9][0-9])+\\/[0-9][0-9]+.*" "\\1" found_root_minor_vers "${ROOTVERSION}")
-  STRING(REGEX REPLACE "^[0-9]+\\.[0-9][0-9]+\\/([0-9][0-9]+).*" "\\1" found_root_patch_vers "${ROOTVERSION}")
-
-  IF (found_root_major_vers LESS 5)
-    MESSAGE( FATAL_ERROR "Invalid ROOT version \"${ROOTERSION}\", at least major version 4 is required, e.g. \"5.00/00\"")
-  ENDIF (found_root_major_vers LESS 5)
-
-  # compute an overall version number which can be compared at once
-  MATH(EXPR req_vers "${req_root_major_vers}*10000 + ${req_root_minor_vers}*100 + ${req_root_patch_vers}")
-  MATH(EXPR found_vers "${found_root_major_vers}*10000 + ${found_root_minor_vers}*100 + ${found_root_patch_vers}")
-  
-  IF (found_vers LESS req_vers)
-    SET(ROOT_FOUND FALSE)
-    SET(ROOT_INSTALLED_VERSION_TOO_OLD TRUE)
-  ELSE (found_vers LESS req_vers)
-    SET(ROOT_FOUND TRUE)
-  ENDIF (found_vers LESS req_vers)
-
-ENDIF (ROOTVERSION)
-
-
-IF (ROOT_FOUND)
-
-  # ask root-config for the library dir
-  # Set ROOT_LIBRARY_DIR
-  IF( WIN32 )
-    SET( ROOT_LIBRARY_DIR $ENV{ROOTSYS}/lib )
-    SET( ROOT_INCLUDE_DIR $ENV{ROOTSYS}/include )
-    SET( ROOT_BINARY_DIR  $ENV{ROOTSYS}/bin )
-
-  ELSE( WIN32 )
-
-    EXEC_PROGRAM( ${ROOT_CONFIG_EXECUTABLE}
-      ARGS "--libdir"
-      OUTPUT_VARIABLE ROOT_LIBRARY_DIR_TMP )
-
-    IF(EXISTS "${ROOT_LIBRARY_DIR_TMP}")
-      SET(ROOT_LIBRARY_DIR ${ROOT_LIBRARY_DIR_TMP} )
-    ELSE(EXISTS "${ROOT_LIBRARY_DIR_TMP}")
-      MESSAGE("Warning: ROOT_CONFIG_EXECUTABLE reported ${ROOT_LIBRARY_DIR_TMP} as library path,")
-      MESSAGE("Warning: but ${ROOT_LIBRARY_DIR_TMP} does NOT exist, ROOT must NOT be installed correctly.")
-    ENDIF(EXISTS "${ROOT_LIBRARY_DIR_TMP}")
-    
-    # ask root-config for the binary dir
-    EXEC_PROGRAM(${ROOT_CONFIG_EXECUTABLE}
-      ARGS "--bindir"
-      OUTPUT_VARIABLE root_bins )
-    SET(ROOT_BINARY_DIR ${root_bins})
-
-    # ask root-config for the include dir
-    EXEC_PROGRAM( ${ROOT_CONFIG_EXECUTABLE}
-      ARGS "--incdir" 
-      OUTPUT_VARIABLE root_headers )
-    SET(ROOT_INCLUDE_DIR ${root_headers})
-    # CACHE INTERNAL "")
-
-    # ask root-config for the library varaibles
-    EXEC_PROGRAM( ${ROOT_CONFIG_EXECUTABLE}
-      ARGS "--noldflags --noauxlibs --libs" 
-      OUTPUT_VARIABLE root_flags )
-
-    #  STRING(REGEX MATCHALL "([^ ])+"  root_libs_all ${root_flags})
-    #  STRING(REGEX MATCHALL "-L([^ ])+"  root_library ${root_flags})
-    #  REMOVE_FROM_LIST(root_flags "${root_libs_all}" "${root_library}")
-
-    SET(ROOT_LIBRARIES ${root_flags})
-
-  ENDIF( WIN32 )
-
-  # Make variables changeble to the advanced user
-  MARK_AS_ADVANCED( ROOT_LIBRARY_DIR ROOT_INCLUDE_DIR ROOT_DEFINITIONS)
-
-  # Set ROOT_INCLUDES
-  SET( ROOT_INCLUDES ${ROOT_INCLUDE_DIR})
-
-  SET(LD_LIBRARY_PATH ${LD_LIBRARY_PATH} ${ROOT_LIBRARY_DIR})
-
-  #######################################
-  #
-  #       Check the executables of ROOT 
-  #          ( rootcint ) 
-  #
-  #######################################
-
-  FIND_PROGRAM(ROOT_CINT_EXECUTABLE
-    NAMES rootcint
-    PATHS ${ROOT_BINARY_DIR}
-    NO_DEFAULT_PATH
-    )
-
-ENDIF (ROOT_FOUND)
-
-
-
-###########################################
-#
-#       Macros for building ROOT dictionary
-#
-###########################################
-
-MACRO (ROOT_GENERATE_DICTIONARY_OLD )
-  
-  set(INFILES "")    
-
-  foreach (_current_FILE ${ARGN})
-
-    IF (${_current_FILE} MATCHES "^.*\\.h$")
-      IF (${_current_FILE} MATCHES "^.*Link.*$")
-        set(LINKDEF_FILE ${_current_FILE})
-      ELSE (${_current_FILE} MATCHES "^.*Link.*$")
-        set(INFILES ${INFILES} ${_current_FILE})
-      ENDIF (${_current_FILE} MATCHES "^.*Link.*$")
-    ELSE (${_current_FILE} MATCHES "^.*\\.h$")
-      IF (${_current_FILE} MATCHES "^.*\\.cxx$")
-        set(OUTFILE ${_current_FILE})
-      ELSE (${_current_FILE} MATCHES "^.*\\.cxx$")
-        set(INCLUDE_DIRS ${INCLUDE_DIRS} -I${_current_FILE})   
-      ENDIF (${_current_FILE} MATCHES "^.*\\.cxx$")
-    ENDIF (${_current_FILE} MATCHES "^.*\\.h$")
-    
-  endforeach (_current_FILE ${ARGN})
-  
-  #  MESSAGE("INFILES: ${INFILES}")
-  #  MESSAGE("OutFILE: ${OUTFILE}")
-  #  MESSAGE("LINKDEF_FILE: ${LINKDEF_FILE}")
-  #  MESSAGE("INCLUDE_DIRS: ${INCLUDE_DIRS}")
-
-  STRING(REGEX REPLACE "(^.*).cxx" "\\1.h" bla "${OUTFILE}")
-  #   MESSAGE("BLA: ${bla}")
-  SET (OUTFILES ${OUTFILE} ${bla})
-
-  ADD_CUSTOM_COMMAND(OUTPUT ${OUTFILES}
-    COMMAND ${ROOT_CINT_EXECUTABLE}
-    ARGS -f ${OUTFILE} -c -DHAVE_CONFIG_H ${INCLUDE_DIRS} ${INFILES} ${LINKDEF_FILE} DEPENDS ${INFILES})
-
-  #   MESSAGE("ROOT_CINT_EXECUTABLE has created the dictionary ${OUTFILE}")
-
-ENDMACRO (ROOT_GENERATE_DICTIONARY_OLD)
-
-###########################################
-#
-#       Macros for building ROOT dictionary
-#
-###########################################
-
-MACRO (ROOT_GENERATE_DICTIONARY INFILES LINKDEF_FILE OUTFILE INCLUDE_DIRS_IN)
-  
-  set(INCLUDE_DIRS)
-
-  foreach (_current_FILE ${INCLUDE_DIRS_IN})
-    set(INCLUDE_DIRS ${INCLUDE_DIRS} -I${_current_FILE})   
-  endforeach (_current_FILE ${INCLUDE_DIRS_IN})
-  
-
-  #  MESSAGE("INFILES: ${INFILES}")
-  #  MESSAGE("OutFILE: ${OUTFILE}")
-  #  MESSAGE("LINKDEF_FILE: ${LINKDEF_FILE}")
-  #  MESSAGE("INCLUDE_DIRS: ${INCLUDE_DIRS}")
-
-  STRING(REGEX REPLACE "^(.*)\\.(.*)$" "\\1.h" bla "${OUTFILE}")
-  #  MESSAGE("BLA: ${bla}")
-  SET (OUTFILES ${OUTFILE} ${bla})
-
-  ADD_CUSTOM_COMMAND(OUTPUT ${OUTFILES}
-    COMMAND ${ROOT_CINT_EXECUTABLE}
-    ARGS -f ${OUTFILE} -c -DHAVE_CONFIG_H ${INCLUDE_DIRS} ${INFILES} ${LINKDEF_FILE} DEPENDS ${INFILES})
-
-ENDMACRO (ROOT_GENERATE_DICTIONARY)
-