CI: move the generator-specific part to a separate job

.gitlab-ci.yml

@@ -205,19 +205,25 @@ include:
   extends: .common
   variables:
     CMAKE_EXTRA_ARGS: -DMTIME_ENABLE_FORTRAN_HL:BOOL=OFF
-    MAKEFLAGS: --jobs=${JOB_COUNT} VERBOSE=1
     # Cmake initializes Fortran compiler flags from FFLAGS:
     FFLAGS: ${FCFLAGS}
   script:
     - mkdir build && cd build
     - >
       cmake ..
+      -G"${CMAKE_GENERATOR}"
       -DCheck_ROOT="${LIBCHECK_ROOT}"
       ${CMAKE_EXTRA_ARGS}
-    - make 2> >(tee ${WARNINGS_FILE})
-    - make test
+    - ${MAKE_CMD} 2> >(tee ${WARNINGS_FILE})
+    - ${MAKE_CMD} test
     - !reference [.common, script]
 
+.common_cmake_makefiles:
+  extends: .common_cmake
+  variables:
+    CMAKE_GENERATOR: Unix Makefiles
+    MAKE_CMD: make --jobs=${JOB_COUNT} VERBOSE=1
+
 .check_gcc:
   variables:
     CFLAGS: -g -O2 -Wall -Wextra -pedantic
@@ -256,12 +262,12 @@ Check with GCC 11.2.0 (Autotools):
   cache:
     policy: pull-push
 
-Check with GCC 11.2.0 (CMake):
+Check with GCC 11.2.0 (CMake, Unix Makefiles):
   extends:
-    - .common_cmake
+    - .common_cmake_makefiles
     - .check_gcc
   before_script:
-    - !reference [.common_cmake, before_script]
+    - !reference [.common_cmake_makefiles, before_script]
     - !reference [.check_gcc, before_script]
 
 Check with Intel 2021.5.0 (Autotools):
@@ -275,12 +281,12 @@ Check with Intel 2021.5.0 (Autotools):
     - !reference [.common_autotools, before_script]
     - !reference [.check_intel, before_script]
 
-Check with Intel 2021.5.0 (CMake):
+Check with Intel 2021.5.0 (CMake, Unix Makefiles):
   extends:
-    - .common_cmake
+    - .common_cmake_makefiles
     - .check_intel
   before_script:
-    - !reference [.common_cmake, before_script]
+    - !reference [.common_cmake_makefiles, before_script]
     - !reference [.check_intel, before_script]
 
 Check with NVHPC 22.5 (Autotools):
@@ -293,12 +299,12 @@ Check with NVHPC 22.5 (Autotools):
     # Libtool does not know about NVHPC and its PIC flag:
     - export FCFLAGS="$FCFLAGS -fpic"
 
-Check with NVHPC 22.5 (CMake):
+Check with NVHPC 22.5 (CMake, Unix Makefiles):
   extends:
-    - .common_cmake
+    - .common_cmake_makefiles
     - .check_nvhpc
   before_script:
-    - !reference [.common_cmake, before_script]
+    - !reference [.common_cmake_makefiles, before_script]
     - !reference [.check_nvhpc, before_script]
 
 Check with NAG 7.1.7114 (Autotools):
@@ -311,12 +317,12 @@ Check with NAG 7.1.7114 (Autotools):
     # nagfor is supposed to use non-default gcc:
     - export FCFLAGS="-Wc=`which gcc` $FCFLAGS"
 
-Check with NAG 7.1.7114 (CMake):
+Check with NAG 7.1.7114 (CMake, Unix Makefiles):
   extends:
-    - .common_cmake
+    - .common_cmake_makefiles
     - .check_nag
   before_script:
-    - !reference [.common_cmake, before_script]
+    - !reference [.common_cmake_makefiles, before_script]
     - !reference [.check_nag, before_script]
     # nagfor is supposed to use non-default gcc:
     - export FFLAGS="-Wc=`which gcc` $FFLAGS"