Merge pull request #18 from andrew-platt/f/LinearAero

F/linear aero

Author: bjonkman

modules/nwtc-library/CMakeLists.txt

@@ -62,14 +62,27 @@ if (CMAKE_BUILD_TYPE MATCHES Debug)
       set_source_files_properties(src/NetLib/slatec/dqk61.f         PROPERTIES COMPILE_FLAGS -frecursive)
       set_source_files_properties(src/NetLib/slatec/qk61.f          PROPERTIES COMPILE_FLAGS -frecursive)
    elseif (${CMAKE_Fortran_COMPILER_ID} STREQUAL "Intel")
-      if (WIN32)
-         set_source_files_properties(src/NetLib/slatec/NWTC_SLATEC.f90 PROPERTIES COMPILE_FLAGS "/assume:recursion")
-         set_source_files_properties(src/NetLib/slatec/dqk61.f         PROPERTIES COMPILE_FLAGS "/assume:recursion")
-         set_source_files_properties(src/NetLib/slatec/qk61.f          PROPERTIES COMPILE_FLAGS "/assume:recursion")
-      else()
-         set_source_files_properties(src/NetLib/slatec/NWTC_SLATEC.f90 PROPERTIES COMPILE_FLAGS "-assume recursion")
-         set_source_files_properties(src/NetLib/slatec/dqk61.f         PROPERTIES COMPILE_FLAGS "-assume recursion")
-         set_source_files_properties(src/NetLib/slatec/qk61.f          PROPERTIES COMPILE_FLAGS "-assume recursion")
+      if("${CMAKE_Fortran_COMPILER_VERSION}" VERSION_LESS "19")
+         if (WIN32)
+            set_source_files_properties(src/NetLib/slatec/NWTC_SLATEC.f90 PROPERTIES COMPILE_FLAGS "/recursive")
+            set_source_files_properties(src/NetLib/slatec/dqk61.f         PROPERTIES COMPILE_FLAGS "/recursive")
+            set_source_files_properties(src/NetLib/slatec/qk61.f          PROPERTIES COMPILE_FLAGS "/recursive")
+         else()
+            set_source_files_properties(src/NetLib/slatec/NWTC_SLATEC.f90 PROPERTIES COMPILE_FLAGS "-recursive")
+            set_source_files_properties(src/NetLib/slatec/dqk61.f         PROPERTIES COMPILE_FLAGS "-recursive")
+            set_source_files_properties(src/NetLib/slatec/qk61.f          PROPERTIES COMPILE_FLAGS "-recursive")
+         endif()
+      else()   # The above syntax will be deprecated after version 20.  This is supported from version 19 onwards
+               # see: https://software.intel.com/content/www/us/en/develop/documentation/fortran-compiler-developer-guide-and-reference/top/compiler-reference/compiler-options/compiler-option-details/floating-point-options/recursive.html
+         if (WIN32)
+            set_source_files_properties(src/NetLib/slatec/NWTC_SLATEC.f90 PROPERTIES COMPILE_FLAGS "/assume:recursion")
+            set_source_files_properties(src/NetLib/slatec/dqk61.f         PROPERTIES COMPILE_FLAGS "/assume:recursion")
+            set_source_files_properties(src/NetLib/slatec/qk61.f          PROPERTIES COMPILE_FLAGS "/assume:recursion")
+         else()
+            set_source_files_properties(src/NetLib/slatec/NWTC_SLATEC.f90 PROPERTIES COMPILE_FLAGS "-assume recursion")
+            set_source_files_properties(src/NetLib/slatec/dqk61.f         PROPERTIES COMPILE_FLAGS "-assume recursion")
+            set_source_files_properties(src/NetLib/slatec/qk61.f          PROPERTIES COMPILE_FLAGS "-assume recursion")
+         endif()
       endif()
    endif()
 endif() 
@@ -79,8 +92,7 @@ if(BUILD_OPENFAST_SIMULINK_API)
 
   if (APPLE OR UNIX)
     if (${CMAKE_Fortran_COMPILER_ID} STREQUAL "GNU")
-      # set(NWTC_SYS_FILE src/SysMatlabLinuxGnu.f90)
-      message(FATAL_ERROR "SIMULINK with GNU is not yet supported.")
+      set(NWTC_SYS_FILE src/SysMatlabLinuxGnu.f90)
     elseif (${CMAKE_Fortran_COMPILER_ID} STREQUAL "Intel")
       set(NWTC_SYS_FILE src/SysMatlabLinuxIntel.f90)
     endif()