Configuration fixes

CMakeLists.txt

@@ -265,6 +265,12 @@ if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_INSTALL_PREFIX)
   endif()
   install(DIRECTORY etc/ DESTINATION ${CMAKE_INSTALL_SYSCONFDIR} USE_SOURCE_PERMISSIONS
                          REGEX system.rootrc EXCLUDE
+                         REGEX system.rootauthrc EXCLUDE
+                         REGEX system.rootdaemonrc EXCLUDE
+                         REGEX rootd.rc.d EXCLUDE
+                         REGEX proofd.rc.d EXCLUDE
+                         REGEX rootd.xinetd EXCLUDE
+                         REGEX proofd.xinetd EXCLUDE
                          REGEX root.mimes EXCLUDE)
   install(DIRECTORY fonts/  DESTINATION ${CMAKE_INSTALL_FONTDIR})
   install(DIRECTORY icons/  DESTINATION ${CMAKE_INSTALL_ICONDIR})

build/unix/compiledata.sh

@@ -75,7 +75,7 @@ CXXFLAGS=`echo $CXXFLAGS | sed 's/-Iinclude //' `
 
 # Remove the flags turning warnings into errors or extending
 # the number of warnings.
-CXXFLAGS=`echo $CXXFLAGS | sed -e 's/-Werror //g' -e 's/-Wall //g' -e 's/-Wshadow //g'  `
+CXXFLAGS=`echo $CXXFLAGS | sed -e 's/-Werror //g' -e 's/-Werror=\S* //g' -e 's/-Wall //g' -e 's/-Wshadow //g'  `
 
 # Determine the compiler version
 BXX="`basename $CXX`"

cmake/modules/FindDPM.cmake

@@ -0,0 +1,23 @@
+# - Locate dpm library
+# Defines:
+#
+#  DPM_FOUND
+#  DPM_INCLUDE_DIR
+#  DPM_INCLUDE_DIRS (not cached)
+#  DPM_LIBRARIES
+
+set(DPM_FOUND FALSE)
+
+find_path(DPM_INCLUDE_DIR NAMES dpm_api.h HINTS ${DPM_DIR}/include $ENV{DPM_DIR}/include /usr/include PATH_SUFFIXES dpm)
+find_library(DPM_dpm_LIBRARY NAMES dpm HINTS ${DPM_DIR}/lib $ENV{DPM_DIR}/lib)
+find_library(DPM_lcgdm_LIBRARY NAMES lcgdm HINTS ${DPM_DIR}/lib $ENV{DPM_DIR}/lib)
+
+set(DPM_INCLUDE_DIRS ${DPM_INCLUDE_DIR})
+set(DPM_LIBRARIES ${DPM_dpm_LIBRARY} ${DPM_lcgdm_LIBRARY})
+
+if (DPM_INCLUDE_DIR AND DPM_dpm_LIBRARY AND DPM_lcgdm_LIBRARY)
+  set(DPM_FOUND TRUE)
+  message(STATUS "Found DPM at: ${DPM_LIBRARIES}")
+endif()
+
+mark_as_advanced(DPM_FOUND DPM_INCLUDE_DIR DPM_dpm_LIBRARY DPM_lcgdm_LIBRARY)

cmake/modules/FindGlobus.cmake

@@ -9,7 +9,7 @@
 
 find_path(GLOBUS_INCLUDE_DIR NAMES globus_common.h
           HINTS ${GLOBUS_DIR}/include $ENV{GLOBUS_LOCATION}/include
-                /opt/globus/include
+                /opt/globus/include /usr/include
           PATH_SUFFIXES gcc32 gcc32dbg gcc32pthr gcc32dbgpthr
                         gcc64 gcc64dbg gcc64pthr gcc64dbgpthr globus)
 
@@ -24,7 +24,7 @@ set(libraries gssapi_gsi gss_assist gsi_credential common gsi_callback proxy_ssl
               openssl gsi_proxy_core callout)
 
 foreach( lib ${libraries})
-  find_library(GLOBUS_${lib}_LIBRARY NAMES globus_${lib}_${flavour} HINTS
+  find_library(GLOBUS_${lib}_LIBRARY NAMES globus_${lib}_${flavour} globus_${lib} HINTS
                ${GLOBUS_DIR}/lib $ENV{GLOBUS_LOCATION}/lib)
   if(GLOBUS_${lib}_LIBRARY)
     set(GLOBUS_${lib}_FOUND 1)

cmake/modules/FindPCRE.cmake

@@ -2,8 +2,8 @@
 #
 # This module defines
 # PCRE_INCLUDE_DIR, where to locate PCRE header files
-# PCRE_LIBRARIES, the libraries to link against to use Pythia6
-# PCRE_FOUND.  If false, you cannot build anything that requires Pythia6.
+# PCRE_LIBRARIES, the libraries to link against to use PCRE
+# PCRE_FOUND.  If false, you cannot build anything that requires PCRE.
 
 set(_PCRE_PATHS ${PCRE_DIR} $ENV{PCRE_DIR})
 

cmake/modules/FindUnuran.cmake

@@ -0,0 +1,21 @@
+# - Locate Unuran library
+# Defines:
+#
+#  UNURAN_FOUND
+#  UNURAN_INCLUDE_DIR
+#  UNURAN_INCLUDE_DIRS (not cached)
+#  UNURAN_LIBRARIES
+
+find_path(UNURAN_INCLUDE_DIR NAMES unuran.h HINTS ${UNURAN_DIR}/include $ENV{UNURAN_DIR}/include /usr/include)
+find_library(UNURAN_LIBRARY NAMES unuran HINTS ${UNURAN_DIR}/lib $ENV{UNURAN_DIR}/lib)
+
+set(UNURAN_INCLUDE_DIRS ${UNURAN_INCLUDE_DIR})
+set(UNURAN_LIBRARIES ${UNURAN_LIBRARY})
+
+
+# handle the QUIETLY and REQUIRED arguments and set UNURAN_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(UNURAN DEFAULT_MSG UNURAN_LIBRARY UNURAN_INCLUDE_DIR)
+
+mark_as_advanced(UNURAN_FOUND UNURAN_INCLUDE_DIR UNURAN_LIBRARY)

cmake/modules/Findgl2ps.cmake

@@ -0,0 +1,21 @@
+# - Locate gl2ps library
+# Defines:
+#
+#  GL2PS_FOUND
+#  GL2PS_INCLUDE_DIR
+#  GL2PS_INCLUDE_DIRS (not cached)
+#  GL2PS_LIBRARIES
+
+find_path(GL2PS_INCLUDE_DIR NAMES gl2ps.h HINTS ${GL2PS_DIR}/include $ENV{GL2PS_DIR}/include /usr/include)
+find_library(GL2PS_LIBRARY NAMES gl2ps HINTS ${GL2PS_DIR}/lib $ENV{GL2PS_DIR}/lib)
+
+set(GL2PS_INCLUDE_DIRS ${GL2PS_INCLUDE_DIR})
+set(GL2PS_LIBRARIES ${GL2PS_LIBRARY})
+
+
+# handle the QUIETLY and REQUIRED arguments and set GL2PS_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GL2PS DEFAULT_MSG GL2PS_LIBRARY GL2PS_INCLUDE_DIR)
+
+mark_as_advanced(GL2PS_FOUND GL2PS_INCLUDE_DIR GL2PS_LIBRARY)

cmake/modules/Findhdfs.cmake

@@ -6,7 +6,7 @@
 #  HDFS_INCLUDE_DIRS (not cached)
 #  HDFS_LIBRARIES
 
-find_path(HDFS_INCLUDE_DIR NAMES hdfs.h  HINTS ${HDFS_DIR}/include $ENV{HDFS_DIR}/include)
+find_path(HDFS_INCLUDE_DIR NAMES hdfs.h  HINTS ${HDFS_DIR}/include $ENV{HDFS_DIR}/include /usr/include/hadoop)
 find_library(HDFS_LIBRARY NAMES hdfs HINTS ${HDFS_DIR}/lib/native $ENV{HDFS_DIR}/lib/native)
 
 set(HDFS_INCLUDE_DIRS ${HDFS_INCLUDE_DIR})

cmake/modules/RootBuildOptions.cmake

@@ -70,9 +70,11 @@ ROOT_BUILD_OPTION(builtin_afterimage ON "Build included libAfterImage, or use sy
 ROOT_BUILD_OPTION(builtin_fftw3 OFF "Build the FFTW3 library internally (downloading tarfile from the Web)")
 ROOT_BUILD_OPTION(builtin_ftgl ON "Build included libFTGL, or use system libftgl")
 ROOT_BUILD_OPTION(builtin_freetype OFF "Build included libfreetype, or use system libfreetype")
+ROOT_BUILD_OPTION(builtin_gl2ps OFF "Build included libgl2ps, or use system libgl2ps")
 ROOT_BUILD_OPTION(builtin_glew ON "Build included libGLEW, or use system libGLEW")
 ROOT_BUILD_OPTION(builtin_openssl OFF "Build OpenSSL internally, or use system OpenSSL")
 ROOT_BUILD_OPTION(builtin_pcre OFF "Build included libpcre, or use system libpcre")
+ROOT_BUILD_OPTION(builtin_unuran OFF "Build included libunuran, or use system libunuran")
 ROOT_BUILD_OPTION(builtin_zlib OFF "Build included libz, or use system libz")
 ROOT_BUILD_OPTION(builtin_lzma OFF "Build included liblzma, or use system liblzma")
 ROOT_BUILD_OPTION(builtin_davix OFF "Build the Davix library internally (downloading tarfile from the Web)")

cmake/modules/RootConfiguration.cmake

@@ -142,12 +142,22 @@ set(zliblibdir ${ZLIB_LIBRARY_DIR})
 set(zliblib ${ZLIB_LIBRARY})
 set(zlibincdir ${ZLIB_INCLUDE_DIR})
 
+set(builtinunuran ${value${builtin_unuran}})
+set(unuranlibdir ${UNURAN_LIBRARY_DIR})
+set(unuranlib ${UNURAN_LIBRARY})
+set(unuranincdir ${UNURAN_INCLUDE_DIR})
+
 set(buildgl ${value${opengl}})
 set(opengllibdir ${OPENGL_LIBRARY_DIR})
 set(openglulib ${OPENGL_glu_LIBRARY})
 set(opengllib ${OPENGL_gl_LIBRARY})
 set(openglincdir ${OPENGL_INCLUDE_DIR})
 
+set(builtingl2ps ${value${builtin_gl2ps}})
+set(gl2pslibdir ${GL2PS_LIBRARY_DIR})
+set(gl2pslib ${GL2PS_LIBRARY})
+set(gl2psincdir ${GL2PS_INCLUDE_DIR})
+
 set(buildldap ${value${ldap}})
 set(ldaplibdir ${LDAP_LIBRARY_DIR})
 set(ldaplib ${LDAP_LIBRARY})
@@ -408,7 +418,13 @@ find_program(PERL_EXECUTABLE perl)
 set(perl ${PERL_EXECUTABLE})
 
 #---RConfigure-------------------------------------------------------------------------------------------------
-set(setresuid undef)
+CHECK_CXX_SOURCE_COMPILES("#include <unistd.h>
+  int main() { int i = setresuid(0, 0, 0); return 0;}" found_setresuid)
+if(found_setresuid)
+  set(setresuid define)
+else()
+  set(setresuid undef)
+endif()
 if(mathmore)
   set(hasmathmore define)
 else()
@@ -543,7 +559,16 @@ install(FILES ${CMAKE_BINARY_DIR}/include/RConfigure.h DESTINATION ${CMAKE_INSTA
 execute_Process(COMMAND hostname OUTPUT_VARIABLE BuildNodeInfo OUTPUT_STRIP_TRAILING_WHITESPACE )
 
 configure_file(${CMAKE_SOURCE_DIR}/config/rootrc.in ${CMAKE_BINARY_DIR}/etc/system.rootrc @ONLY NEWLINE_STYLE UNIX)
+configure_file(${CMAKE_SOURCE_DIR}/config/rootauthrc.in ${CMAKE_BINARY_DIR}/etc/system.rootauthrc @ONLY NEWLINE_STYLE UNIX)
+configure_file(${CMAKE_SOURCE_DIR}/config/rootdaemonrc.in ${CMAKE_BINARY_DIR}/etc/system.rootdaemonrc @ONLY NEWLINE_STYLE UNIX)
+
+configure_file(${CMAKE_SOURCE_DIR}/config/rootd.in ${CMAKE_BINARY_DIR}/etc/daemons/rootd.rc.d @ONLY NEWLINE_STYLE UNIX)
+configure_file(${CMAKE_SOURCE_DIR}/config/rootd.xinetd.in ${CMAKE_BINARY_DIR}/etc/daemons/rootd.xinetd @ONLY NEWLINE_STYLE UNIX)
+configure_file(${CMAKE_SOURCE_DIR}/config/proofd.in ${CMAKE_BINARY_DIR}/etc/daemons/proofd.rc.d @ONLY NEWLINE_STYLE UNIX)
+configure_file(${CMAKE_SOURCE_DIR}/config/proofd.xinetd.in ${CMAKE_BINARY_DIR}/etc/daemons/proofd.xinetd @ONLY NEWLINE_STYLE UNIX)
+
 configure_file(${CMAKE_SOURCE_DIR}/config/RConfigOptions.in include/RConfigOptions.h NEWLINE_STYLE UNIX)
+
 if(ruby)
   file(APPEND ${CMAKE_BINARY_DIR}/include/RConfigOptions.h "\#define R__RUBY_MAJOR ${RUBY_MAJOR_VERSION}\n\#define R__RUBY_MINOR ${RUBY_MINOR_VERSION}\n")
 endif()
@@ -560,7 +585,7 @@ configure_file(${CMAKE_SOURCE_DIR}/cmake/scripts/ROOTConfig-version.cmake.in
 #---Compiler flags (because user apps are a bit dependent on them...)----------------------------------------
 string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __cxxflags "${CMAKE_CXX_FLAGS}")
 string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __cflags "${CMAKE_C_FLAGS}")
-string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __fflags "${CMAKE_fortran_FLAGS}")
+string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __fflags "${CMAKE_Fortran_FLAGS}")
 string(REGEX MATCHALL "-(D|U)[^ ]*" __defs "${CMAKE_CXX_FLAGS}")
 set(ROOT_COMPILER_FLAG_HINTS "#
 set(ROOT_DEFINITIONS \"${__defs}\")
@@ -692,8 +717,21 @@ install(FILES ${CMAKE_BINARY_DIR}/include/RConfigOptions.h
 
 install(FILES ${CMAKE_BINARY_DIR}/etc/root.mimes
               ${CMAKE_BINARY_DIR}/etc/system.rootrc
+              ${CMAKE_BINARY_DIR}/etc/system.rootauthrc
+              ${CMAKE_BINARY_DIR}/etc/system.rootdaemonrc
               DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
 
+install(FILES ${CMAKE_BINARY_DIR}/etc/daemons/rootd.rc.d
+              ${CMAKE_BINARY_DIR}/etc/daemons/proofd.rc.d
+              PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
+                          GROUP_EXECUTE GROUP_READ
+                          WORLD_EXECUTE WORLD_READ
+              DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/daemons)
+
+install(FILES ${CMAKE_BINARY_DIR}/etc/daemons/rootd.xinetd
+              ${CMAKE_BINARY_DIR}/etc/daemons/proofd.xinetd
+              DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/daemons)
+
 install(FILES ${CMAKE_BINARY_DIR}/root-help.el DESTINATION ${CMAKE_INSTALL_ELISPDIR})
 
 if(NOT gnuinstall)

cmake/modules/RootNewMacros.cmake

@@ -39,7 +39,7 @@ endif()
 if(soversion)
   set(ROOT_LIBRARY_PROPERTIES ${ROOT_LIBRARY_PROPERTIES}
       VERSION ${ROOT_VERSION}
-      SOVERSION ${ROOT_MAJOR_VERSION}
+      SOVERSION ${ROOT_MAJOR_VERSION}.${ROOT_MINOR_VERSION}
       SUFFIX ${libsuffix}
       PREFIX ${libprefix} )
 else()

cmake/modules/SearchInstalledSoftware.cmake

@@ -38,6 +38,16 @@ if(builtin_zlib)
   set(ZLIB_LIBRARY "" CACHE PATH "" FORCE)
 endif()
 
+#---Check for Unuran ------------------------------------------------------------------
+if(NOT builtin_unuran)
+  message(STATUS "Looking for Unuran")
+  find_Package(Unuran)
+  if(NOT UNURAN_FOUND)
+    message(STATUS "Unuran not found. Switching on builtin_unuran option")
+    set(builtin_unuran ON CACHE BOOL "" FORCE)
+  endif()
+endif()
+
 #---Check for Freetype---------------------------------------------------------------
 if(NOT builtin_freetype)
   message(STATUS "Looking for Freetype")
@@ -440,6 +450,16 @@ if(opengl)
   endif()
 endif()
 
+#---Check for gl2ps ------------------------------------------------------------------
+if(NOT builtin_gl2ps)
+  message(STATUS "Looking for gl2ps")
+  find_Package(gl2ps)
+  if(NOT GL2PS_FOUND)
+    message(STATUS "gl2ps not found. Switching on builtin_gl2ps option")
+    set(builtin_gl2ps ON CACHE BOOL "" FORCE)
+  endif()
+endif()
+
 #---Check for Graphviz installation-------------------------------------------------------
 if(gviz)
   message(STATUS "Looking for Graphviz")
@@ -562,15 +582,29 @@ if(ssl OR builtin_openssl)
 endif()
 
 #---Check for Castor-------------------------------------------------------------------
-if(castor OR rfio)
+if(castor)
   message(STATUS "Looking for Castor")
   find_package(Castor)
   if(NOT CASTOR_FOUND)
     if(fail-on-missing)
       message(FATAL_ERROR "Castor libraries not found and they are required (castor option enabled)")
     else()
-      message(STATUS "Castor not found. Switching off castor/rfio option")
+      message(STATUS "Castor not found. Switching off castor option")
       set(castor OFF CACHE BOOL "" FORCE)
+    endif()
+  endif()
+endif()
+
+#---Check for RFIO-------------------------------------------------------------------
+if(rfio)
+  message(STATUS "Looking for RFIO")
+  find_package(Castor)
+  find_package(DPM)
+  if(NOT CASTOR_FOUND AND NOT DPM_FOUND)
+    if(fail-on-missing)
+      message(FATAL_ERROR "Castor or DPM libraries not found and one of them is required (rfio option enabled)")
+    else()
+      message(STATUS "Castor or DPM not found. Switching off rfio option")
       set(rfio OFF CACHE BOOL "" FORCE)
     endif()
   endif()

cmake/modules/SetUpLinux.cmake

@@ -19,7 +19,7 @@ if(${SYSCTL_OUTPUT} MATCHES x86_64)
     message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
   endif()
 elseif(${SYSCTL_OUTPUT} MATCHES aarch64)
-  message(STATUS "Found a 64bit system")
+  message(STATUS "Found a 64bit ARM system")
   set(SPECIAL_CINT_FLAGS "-DG__64BIT")
   if(CMAKE_COMPILER_IS_GNUCXX)
     message(STATUS "Found GNU compiler collection")
@@ -30,8 +30,8 @@ elseif(${SYSCTL_OUTPUT} MATCHES aarch64)
   else()
     message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
   endif()
-elseif(${SYSCTL_OUTPUT} MATCHES ppc64le)
-  message(STATUS "Found a 64bit ppc64 little endian system")
+elseif(${SYSCTL_OUTPUT} MATCHES ppc64)
+  message(STATUS "Found a 64bit PPC system (ppc64/ppc64le)")
   set(SPECIAL_CINT_FLAGS "-DG__64BIT")
   if(CMAKE_COMPILER_IS_GNUCXX)
     message(STATUS "Found GNU compiler collection")
@@ -42,6 +42,44 @@ elseif(${SYSCTL_OUTPUT} MATCHES ppc64le)
   else()
     message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
   endif()
+elseif(${SYSCTL_OUTPUT} MATCHES arm)
+  message(STATUS "Found a 32bit ARM system")
+  set(SPECIAL_CINT_FLAGS "")
+  if(CMAKE_COMPILER_IS_GNUCXX)
+    message(STATUS "Found GNU compiler collection")
+    set(ROOT_ARCHITECTURE linuxarm)
+  elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
+    message(STATUS "Found CLANG compiler")
+    set(ROOT_ARCHITECTURE linuxarm)
+  else()
+    message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
+  endif()
+elseif(${SYSCTL_OUTPUT} MATCHES s390x)
+  message(STATUS "Found a 64bit system")
+  set(BIT_ENVIRONMENT "-m64")
+  set(SPECIAL_CINT_FLAGS "-DG__64BIT")
+  if(CMAKE_COMPILER_IS_GNUCXX)
+    message(STATUS "Found GNU compiler collection")
+    set(ROOT_ARCHITECTURE linuxs390xgcc)
+  elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
+    message(STATUS "Found CLANG compiler")
+    set(ROOT_ARCHITECTURE linuxs390xgcc)
+  else()
+    message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
+  endif()
+elseif(${SYSCTL_OUTPUT} MATCHES s390)
+  message(STATUS "Found a 31bit system")
+  set(BIT_ENVIRONMENT "-m31")
+  set(SPECIAL_CINT_FLAGS "")
+  if(CMAKE_COMPILER_IS_GNUCXX)
+    message(STATUS "Found GNU compiler collection")
+    set(ROOT_ARCHITECTURE linuxs390gcc)
+  elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
+    message(STATUS "Found CLANG compiler")
+    set(ROOT_ARCHITECTURE linuxs390gcc)
+  else()
+    message(FATAL_ERROR "There is no Setup for this compiler up to now. Don't know what to do. Stop cmake at this point.")
+  endif()
 else()
   message(STATUS "Found a 32bit system")
   set(BIT_ENVIRONMENT "-m32")
@@ -73,7 +111,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe ${BIT_ENVIRONMENT} ${FP_MATH_FLAGS} -Wshadow -Wall -W -Woverloaded-virtual -fsigned-char -fPIC")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe ${BIT_ENVIRONMENT} -Wall -W -fPIC")
 
-  set(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} ${BIT_ENVIRONMENT} -std=legacy")
+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${BIT_ENVIRONMENT} -std=legacy")
 
   set(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
   set(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
@@ -110,7 +148,7 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe ${BIT_ENVIRONMENT} ${FP_MATH_FLAGS} -Wshadow -Wall -W -Woverloaded-virtual -fsigned-char -fPIC")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pipe ${BIT_ENVIRONMENT} -Wall -W -fPIC")
 
-  set(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} ${BIT_ENVIRONMENT} -std=legacy")
+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${BIT_ENVIRONMENT} -std=legacy")
 
   set(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
   set(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
@@ -147,7 +185,7 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL Intel)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -wd1476")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -restrict")
 
-  set(CMAKE_Fortran_FLAGS "${CMAKE_FORTRAN_FLAGS} -fPIC")
+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fPIC")
 
   set(CINT_CXX_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")
   set(CINT_C_DEFINITIONS "-DG__REGEXP -DG__UNIX -DG__SHAREDLIB -DG__OSFDLL -DG__ROOT -DG__REDIRECTIO -DG__STD_EXCEPTION ${SPECIAL_CINT_FLAGS}")