Improve control of recursive flags in the Makefiles

Author: weslleyspereira

CMakeLists.txt

@@ -100,14 +100,23 @@ check_fortran_compiler_flag("-Mrecursive" _MrecursiveFlag)
 
 # Add recursive flag
 if(_recursiveFlag)
-  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -recursive")
-  # message(STATUS ${CMAKE_Fortran_FLAGS})
+  string(REGEX MATCH "-recursive" output_test <string> "${CMAKE_Fortran_FLAGS}")
+  if(NOT output_test) 
+    message(STATUS "Adding recursive flag to CMAKE_Fortran_FLAGS.")
+    set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -recursive")
+  endif()
 elseif(_frecursiveFlag)
-  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -frecursive")
-  # message(STATUS ${CMAKE_Fortran_FLAGS})
+  string(REGEX MATCH "-frecursive" output_test <string> "${CMAKE_Fortran_FLAGS}")
+  if(NOT output_test) 
+    message(STATUS "Adding recursive flag to CMAKE_Fortran_FLAGS.")
+    set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -frecursive")
+  endif()
 elseif(_MrecursiveFlag)
-  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Mrecursive")
-  # message(STATUS ${CMAKE_Fortran_FLAGS})
+  string(REGEX MATCH "-Mrecursive" output_test <string> "${CMAKE_Fortran_FLAGS}")
+  if(NOT output_test) 
+    message(STATUS "Adding recursive flag to CMAKE_Fortran_FLAGS.")
+    set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Mrecursive")
+  endif()
 endif()
 
 if(UNIX)

TESTING/EIG/Makefile

@@ -157,7 +157,7 @@ cleanobj:
 cleanexe:
 	rm -f xeigtst*
 
-FFLAGS_DRV_NORECURSIVE := $(filter-out -frecursive -Mrecursive,$(FFLAGS_DRV))
+FFLAGS_DRV_NORECURSIVE := $(filter-out -frecursive -Mrecursive -recursive,$(FFLAGS_DRV))
 
 schkee.o: schkee.f
 	$(FC) $(FFLAGS_DRV) -c -o $@ $<