cmake/ci lint

Author: scivision

.github/workflows/ci_cmake.yml

@@ -25,9 +25,11 @@ jobs:
 
 
   macos:
+    needs: linux
+    runs-on: macos-latest
     env:
       FC: gfortran-11
-    runs-on: macos-latest
+
     steps:
     - uses: actions/checkout@v2
 
@@ -38,9 +40,12 @@ jobs:
 
   windows:
     runs-on: windows-latest
+    env:
+      CMAKE_GENERATOR: MinGW Makefiles
+
     steps:
     - uses: actions/checkout@v2
 
-    - run: cmake --preset default -G "MinGW Makefiles"
+    - run: cmake --preset default
     - run: cmake --build build --parallel
     - run: ctest --preset default

CMakeLists.txt

@@ -29,8 +29,10 @@ include(CTest)
 
 include (cmake/compilers.cmake)
 
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_C_STANDARD 99)
+
 add_library(c_lib call_c.c)
-target_compile_features(c_lib PRIVATE c_std_99)
 
 add_executable(f_call_c f_call_c.f90 $<TARGET_OBJECTS:c_lib>)
 add_test(NAME FortranCallC COMMAND f_call_c)
@@ -39,14 +41,16 @@ add_test(NAME FortranCallC COMMAND f_call_c)
 add_library(call_f OBJECT c_call_f.f90)
 
 add_executable(cxx_call_f cxx_call_f.cxx $<TARGET_OBJECTS:call_f>)
-target_compile_features(cxx_call_f PRIVATE cxx_std_11)
 add_test(NAME CXXCallFortran COMMAND cxx_call_f)
 
 # -- Fortran calling C++
 add_library(cxx_lib OBJECT call_cxx.cxx)
-target_compile_features(cxx_lib PRIVATE cxx_std_11)
 
 add_executable(f_call_cxx f_call_c.f90 $<TARGET_OBJECTS:cxx_lib>)
 # LINKER_LANGUAGE option is necessary for ifort at least
 set_target_properties(f_call_cxx PROPERTIES LINKER_LANGUAGE Fortran)
 add_test(NAME FortranCallC++ COMMAND f_call_cxx)
+
+set_tests_properties(FortranCallC CXXCallFortran FortranCallC++
+PROPERTIES
+TIMEOUT 5)

CMakePresets.json

@@ -35,7 +35,8 @@
   },
   "execution": {
     "noTestsAction": "error",
-    "stopOnFailure": false}
+    "stopOnFailure": false
+  }
 }
 ]
 }