Embed Fortran standard in target library options to ensure downstream compatibility

Author: sethrj

CMakeLists.txt

@@ -34,6 +34,9 @@ endif()
 
 option(BUILD_SHARED_LIBS "Build shared libraries" ON)
 
+set(FLIBCPP_FORTRAN_STD "f2003" CACHE STRING
+   "Fortran standard for compiling generated code")
+
 #---------------------------------------------------------------------------#
 # SWIG setup
 #---------------------------------------------------------------------------#
@@ -152,12 +155,19 @@ function(swig_fortran_add_module name)
     )
   endif()
 
-  # Enable C++11
+  # Compile C++ code with C++11
   target_compile_features(${name}
     PRIVATE
       cxx_std_11
   )
 
+  if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
+    # Compile Fortran code with given standard
+    target_compile_options(${name}
+      PUBLIC $<$<COMPILE_LANGUAGE:Fortran>:-std=${FLIBCPP_FORTRAN_STD}>
+    )
+  endif()
+
   target_include_directories(${name}
     PUBLIC
       # Fortran modules

scripts/cmake_vostok

@@ -2,7 +2,7 @@
 BUILD=/rnsdhpc/code/build/flibcpp
 SOURCE=/rnsdhpc/code/src/flibcpp
 
-test -d "$BUILD" || mkdir "$BUILD"
+test -d "$BUILD" || mkdir -p "$BUILD"
 cd $BUILD
 
 cmake \
@@ -11,8 +11,8 @@ cmake \
   -D SWIG_EXECUTABLE="/rnsdhpc/code/build/swig-debug/swig"  \
   -D SWIG_DIR="/rnsdhpc/code/src/swig/Lib" \
   -D BUILD_SHARED_LIBS=ON \
-  -D CMAKE_Fortran_FLAGS="-Wall -Wextra -Wimplicit-procedure -Wimplicit-interface -Wno-compare-reals -std=f2003" \
+  -D CMAKE_Fortran_FLAGS="-Wall -Wextra -Wimplicit-procedure -Wimplicit-interface -Wno-compare-reals" \
   -D CMAKE_CXX_FLAGS="-Wall -Wextra" \
-  -D CMAKE_INSTALL_PREFIX="/rnsdhpc/code/install/flibcpp"
+  -D CMAKE_INSTALL_PREFIX="/rnsdhpc/code/install/flibcpp" \
   $SOURCE
 ninja