|
 |
a95a6d6 |
diff --git a/cmake/modules/RootConfiguration.cmake b/cmake/modules/RootConfiguration.cmake
|
|
|
a95a6d6 |
index f51bcbe..1ee0602 100644
|
|
|
a95a6d6 |
--- a/cmake/modules/RootConfiguration.cmake
|
|
|
a95a6d6 |
+++ b/cmake/modules/RootConfiguration.cmake
|
|
|
a95a6d6 |
@@ -569,7 +569,7 @@ configure_file(${CMAKE_SOURCE_DIR}/cmake/scripts/ROOTConfig-version.cmake.in
|
|
|
a95a6d6 |
#---Compiler flags (because user apps are a bit dependent on them...)----------------------------------------
|
|
|
a95a6d6 |
string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __cxxflags "${CMAKE_CXX_FLAGS}")
|
|
|
a95a6d6 |
string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __cflags "${CMAKE_C_FLAGS}")
|
|
|
a95a6d6 |
-string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __fflags "${CMAKE_fortran_FLAGS}")
|
|
|
a95a6d6 |
+string(REGEX REPLACE "(^|[ ]*)-W[^ ]*" "" __fflags "${CMAKE_Fortran_FLAGS}")
|
|
|
29a5bac |
string(REGEX MATCHALL "-(D|U)[^ ]*" __defs "${CMAKE_CXX_FLAGS}")
|
|
|
a95a6d6 |
set(ROOT_COMPILER_FLAG_HINTS "#
|
|
|
29a5bac |
set(ROOT_DEFINITIONS \"${__defs}\")
|
|
|
a95a6d6 |
diff --git a/cmake/scripts/RootUseFile.cmake.in b/cmake/scripts/RootUseFile.cmake.in
|
|
|
a95a6d6 |
index 045926d..a419744 100644
|
|
|
a95a6d6 |
--- a/cmake/scripts/RootUseFile.cmake.in
|
|
|
a95a6d6 |
+++ b/cmake/scripts/RootUseFile.cmake.in
|
|
|
a95a6d6 |
@@ -9,4 +9,4 @@ link_directories(${ROOT_LIBRARY_DIR})
|
|
|
a95a6d6 |
add_definitions(${ROOT_DEFINITIONS})
|
|
|
a95a6d6 |
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ROOT_CXX_FLAGS}")
|
|
|
a95a6d6 |
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ROOT_C_FLAGS}")
|
|
|
a95a6d6 |
-set(CMAKE_fortran_FLAGS "${CMAKE_fortran_FLAGS} ${ROOT_fortran_FLAGS}")
|
|
|
a95a6d6 |
+set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${ROOT_fortran_FLAGS}")
|
|
|
a95a6d6 |
diff --git a/etc/cmake/RootUseFile.cmake b/etc/cmake/RootUseFile.cmake
|
|
|
a95a6d6 |
index b9a8e34..f931ad3 100644
|
|
|
a95a6d6 |
--- a/etc/cmake/RootUseFile.cmake
|
|
|
a95a6d6 |
+++ b/etc/cmake/RootUseFile.cmake
|
|
|
a95a6d6 |
@@ -6,4 +6,4 @@ link_directories(${ROOT_LIBRARY_DIR})
|
|
|
a95a6d6 |
add_definitions(${ROOT_DEFINITIONS})
|
|
|
a95a6d6 |
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ROOT_CXX_FLAGS}")
|
|
|
a95a6d6 |
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ROOT_C_FLAGS}")
|
|
|
a95a6d6 |
-set(CMAKE_fortran_FLAGS "${CMAKE_fortran_FLAGS} ${ROOT_fortran_FLAGS}")
|
|
|
a95a6d6 |
+set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${ROOT_fortran_FLAGS}")
|