Back to home page

EIC code displayed by LXR

 
 

    


Warning, /eic-spack/spack_repo/eic/packages/sartre/FindROOT-new-version-format.diff is written in an unsupported language. File is not indexed.

0001 --- cmake/modules/FindROOT.cmake        (revision 487)
0002 +++ cmake/modules/FindROOT.cmake        (working copy)
0003 @@ -62,14 +62,14 @@
0004    ENDIF (NOT ROOT_MIN_VERSION)
0005     
0006    # now parse the parts of the user given version string into variables
0007 -  STRING(REGEX REPLACE "^([0-9]+)\\.[0-9][0-9]+\\/[0-9][0-9]+" "\\1" req_root_major_vers "${ROOT_MIN_VERSION}")
0008 -  STRING(REGEX REPLACE "^[0-9]+\\.([0-9][0-9])+\\/[0-9][0-9]+.*" "\\1" req_root_minor_vers "${ROOT_MIN_VERSION}")
0009 -  STRING(REGEX REPLACE "^[0-9]+\\.[0-9][0-9]+\\/([0-9][0-9]+)" "\\1" req_root_patch_vers "${ROOT_MIN_VERSION}")
0010 +  STRING(REGEX REPLACE "^([0-9]+)\\.[0-9][0-9]+[\\/.][0-9][0-9]+" "\\1" req_root_major_vers "${ROOT_MIN_VERSION}")
0011 +  STRING(REGEX REPLACE "^[0-9]+\\.([0-9][0-9])+[\\/.][0-9][0-9]+.*" "\\1" req_root_minor_vers "${ROOT_MIN_VERSION}")
0012 +  STRING(REGEX REPLACE "^[0-9]+\\.[0-9][0-9]+[\\/.]([0-9][0-9]+)" "\\1" req_root_patch_vers "${ROOT_MIN_VERSION}")
0013     
0014    # and now the version string given by qmake
0015 -  STRING(REGEX REPLACE "^([0-9]+)\\.[0-9][0-9]+\\/[0-9][0-9]+.*" "\\1" found_root_major_vers "${ROOTVERSION}")
0016 -  STRING(REGEX REPLACE "^[0-9]+\\.([0-9][0-9])+\\/[0-9][0-9]+.*" "\\1" found_root_minor_vers "${ROOTVERSION}")
0017 -  STRING(REGEX REPLACE "^[0-9]+\\.[0-9][0-9]+\\/([0-9][0-9]+).*" "\\1" found_root_patch_vers "${ROOTVERSION}")
0018 +  STRING(REGEX REPLACE "^([0-9]+)\\.[0-9][0-9]+[\\/.][0-9][0-9]+.*" "\\1" found_root_major_vers "${ROOTVERSION}")
0019 +  STRING(REGEX REPLACE "^[0-9]+\\.([0-9][0-9])+[\\/.][0-9][0-9]+.*" "\\1" found_root_minor_vers "${ROOTVERSION}")
0020 +  STRING(REGEX REPLACE "^[0-9]+\\.[0-9][0-9]+[\\/.]([0-9][0-9]+).*" "\\1" found_root_patch_vers "${ROOTVERSION}")
0021  
0022    IF (found_root_major_vers LESS 5)
0023      MESSAGE( FATAL_ERROR "Invalid ROOT version \"${ROOTERSION}\", at least major version 4 is required, e.g. \"5.00/00\"")