env var CMAKE_BUILD_TYPE in CMake >= 3.22

scivision · scivision · commit 62f0b6deff9c · 2021-10-07T14:41:39.000-04:00
diff --git a/.github/workflows/ci_cmake.yml b/.github/workflows/ci_cmake.yml
@@ -3,6 +3,7 @@ name: ci_cmake
 env:
     CMAKE_BUILD_PARALLEL_LEVEL: 2
     CTEST_PARALLEL_LEVEL: 2
+    CMAKE_BUILD_TYPE: Release
 
 on:
   push:
@@ -40,6 +41,7 @@ jobs:
 
 
   windows:
+    needs: linux
     runs-on: windows-latest
     env:
       CMAKE_GENERATOR: MinGW Makefiles
diff --git a/.github/workflows/intel-oneapi.yml b/.github/workflows/intel-oneapi.yml
@@ -1,8 +1,11 @@
 name: intel-oneapi
 
 env:
-  CMAKE_BUILD_PARALLEL_LEVEL: 2
   CTEST_PARALLEL_LEVEL: 2
+  CMAKE_BUILD_TYPE: Release
+  CC: icx
+  CXX: icpx
+  FC: ifx
 
 on:
   push:
@@ -43,9 +46,6 @@ jobs:
 
     - name: Configure multi
       env:
-        CC: icx
-        CXX: icpx
-        FC: ifort
         MPI_ROOT: ${{ env.I_MPI_ROOT }}
       run: cmake --preset multi
 
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -8,15 +8,16 @@
 },
 {
   "name": "multi", "inherits": "default",
+  "displayName": "Ninja Multi-Config",
   "generator": "Ninja Multi-Config"
 },
 {
   "name": "intel", "inherits": "default",
-  "displayName": "Intel oneAPI LLVM",
+  "displayName": "Intel oneAPI compiler",
   "binaryDir": "${sourceDir}/build-intel",
   "environment": {
     "CC": "icx",
-    "FC": "ifort"
+    "FC": "ifx"
   }
 }
 ],
diff --git a/cmake/compilers.cmake b/cmake/compilers.cmake
@@ -18,7 +18,6 @@ add_compile_options(
 "$<$<COMPILE_LANG_AND_ID:Fortran,GNU>:-mtune=native;-Wall;-Wextra;-fimplicit-none>"
 "$<$<AND:$<COMPILE_LANG_AND_ID:Fortran,GNU>,$<CONFIG:Release>>:-fno-backtrace;-Wno-maybe-uninitialized>"
 "$<$<AND:$<COMPILE_LANG_AND_ID:Fortran,GNU>,$<CONFIG:RelWithDebInfo>>:-Wno-maybe-uninitialized>"
-
 )
 
 if(NOT EXISTS ${PROJECT_BINARY_DIR}/.gitignore)

Original file line number	Diff line number	Diff line change
`@@ -8,15 +8,16 @@`
`8`	`8`	`},`
`9`	`9`	`{`
`10`	`10`	`"name": "multi", "inherits": "default",`
	`11`	`+ "displayName": "Ninja Multi-Config",`
`11`	`12`	`"generator": "Ninja Multi-Config"`
`12`	`13`	`},`
`13`	`14`	`{`
`14`	`15`	`"name": "intel", "inherits": "default",`
`15`		`- "displayName": "Intel oneAPI LLVM",`
	`16`	`+ "displayName": "Intel oneAPI compiler",`
`16`	`17`	`"binaryDir": "${sourceDir}/build-intel",`
`17`	`18`	`"environment": {`
`18`	`19`	`"CC": "icx",`
`19`		`- "FC": "ifort"`
	`20`	`+ "FC": "ifx"`
`20`	`21`	`}`
`21`	`22`	`}`
`22`	`23`	`],`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@ add_compile_options(`
`18`	`18`	`"$<$<COMPILE_LANG_AND_ID:Fortran,GNU>:-mtune=native;-Wall;-Wextra;-fimplicit-none>"`
`19`	`19`	`"$<$<AND:$<COMPILE_LANG_AND_ID:Fortran,GNU>,$<CONFIG:Release>>:-fno-backtrace;-Wno-maybe-uninitialized>"`
`20`	`20`	`"$<$<AND:$<COMPILE_LANG_AND_ID:Fortran,GNU>,$<CONFIG:RelWithDebInfo>>:-Wno-maybe-uninitialized>"`
`21`		`-`
`22`	`21`	`)`
`23`	`22`
`24`	`23`	`if(NOT EXISTS ${PROJECT_BINARY_DIR}/.gitignore)`