Merge branch 'fortran-lang:master' into fix_number_of_columns

Author: perazz

.github/workflows/CI.yml

@@ -25,17 +25,16 @@ jobs:
  - {compiler: gcc, version: 11}
  - {compiler: gcc, version: 12}
  - {compiler: gcc, version: 13}
- - {compiler: intel, version: '2024.1'}
- - {compiler: intel-classic, version: '2021.9'}
- build: [cmake]
+ - {compiler: intel, version: '2024.1'} 
+ build: [cmake] 
  include:
+ - os: ubuntu-22.04
+ build: cmake
+ toolchain: {compiler: intel-classic, version: '2021.10'} 
  - os: ubuntu-latest
  build: cmake-inline
- toolchain:
- - {compiler: gcc, version: 10}
+ toolchain: {compiler: gcc, version: 10}
  exclude:
- - os: macos-13
- toolchain: {compiler: intel-classic, version: '2021.9'}
  - os: macos-13
  toolchain: {compiler: intel, version: '2024.1'}
  - os: macos-13
@@ -56,7 +55,7 @@ jobs:
  run: pip install --upgrade fypp ninja
 
  - name: Setup Fortran compiler
- uses: fortran-lang/setup-fortran@v1.6.1
+ uses: fortran-lang/setup-fortran@v1.6.2
  id: setup-fortran
  with:
  compiler: ${{ matrix.toolchain.compiler }}

test/hash_functions/CMakeLists.txt

@@ -14,13 +14,22 @@ target_sources(
  waterhash.c
  generate_hash_arrays.cpp
 )
+
 if(CMAKE_Fortran_COMPILER_ID MATCHES "^Intel")
+
+ # Set the C++ standard to prevent icpc breakage
+ set(CMAKE_CXX_STANDARD 11)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ set(CMAKE_CXX_EXTENSIONS OFF)
+
  set_target_properties(test_hash_functions PROPERTIES LINKER_LANGUAGE Fortran)
 endif()
+
 if(CMAKE_Fortran_COMPILER_ID STREQUAL GNU AND CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 10.0)
  target_compile_options(
  test_hash_functions
  PRIVATE
  $<$<COMPILE_LANGUAGE:Fortran>:-fno-range-check>
-  )
+ )
 endif()
+