diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2023-02-17 22:37:26 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-17 22:37:26 (GMT) |
| commit | bfef9945a88d52ad449b2f871c6d0a80ab94170f (patch) | |
| tree | 11624aa2bc28f16202cb3f35ec87ec9e73a03067 /config/toolchain | |
| parent | 32a54c0e2e836a9d7818cf6adfd4f0259ae2cb59 (diff) | |
| download | hdf5-bfef9945a88d52ad449b2f871c6d0a80ab94170f.zip hdf5-bfef9945a88d52ad449b2f871c6d0a80ab94170f.tar.gz hdf5-bfef9945a88d52ad449b2f871c6d0a80ab94170f.tar.bz2 | |
Develop toolchain lowercase names and updates (#2426)
* lowercase the toolchain filenames
* Change name of option define
* Update CI with changed toolchain name
* Correct Intel compiler names
* Account for Intels name for compiler based on clang
* Make icx default and rename classic to icc
Diffstat (limited to 'config/toolchain')
| -rw-r--r-- | config/toolchain/ icc.cmake | 11 | ||||
| -rw-r--r-- | config/toolchain/gcc.cmake (renamed from config/toolchain/GCC.cmake) | 0 | ||||
| -rw-r--r-- | config/toolchain/intel.cmake | 13 | ||||
| -rw-r--r-- | config/toolchain/pgi.cmake (renamed from config/toolchain/PGI.cmake) | 0 |
4 files changed, 14 insertions, 10 deletions
diff --git a/config/toolchain/ icc.cmake b/config/toolchain/ icc.cmake new file mode 100644 index 0000000..97f6a64 --- /dev/null +++ b/config/toolchain/ icc.cmake @@ -0,0 +1,11 @@ +# Uncomment the following to use cross-compiling +#set(CMAKE_SYSTEM_NAME Linux) + +set(CMAKE_COMPILER_VENDOR "intel") + +set(CMAKE_C_COMPILER icc) +set(CMAKE_CXX_COMPILER icpc) +set(CMAKE_Fortran_COMPILER ifort) + +# the following is used if cross-compiling +set(CMAKE_CROSSCOMPILING_EMULATOR "") diff --git a/config/toolchain/GCC.cmake b/config/toolchain/gcc.cmake index c41d0ca..c41d0ca 100644 --- a/config/toolchain/GCC.cmake +++ b/config/toolchain/gcc.cmake diff --git a/config/toolchain/intel.cmake b/config/toolchain/intel.cmake index ae1d2f8..f8f60b2 100644 --- a/config/toolchain/intel.cmake +++ b/config/toolchain/intel.cmake @@ -3,16 +3,9 @@ set(CMAKE_COMPILER_VENDOR "intel") -if(USE_SANITIZER) - set(CMAKE_C_COMPILER icl) - set(CMAKE_CXX_COMPILER icl++) - set(CMAKE_Fortran_COMPILER ifort) - set(INTEL_CLANG ON) -else () - set(CMAKE_C_COMPILER icc) - set(CMAKE_CXX_COMPILER icpc) - set(CMAKE_Fortran_COMPILER ifort) -endif () +set(CMAKE_C_COMPILER icx) +set(CMAKE_CXX_COMPILER icpx) +set(CMAKE_Fortran_COMPILER ifx) # the following is used if cross-compiling set(CMAKE_CROSSCOMPILING_EMULATOR "") diff --git a/config/toolchain/PGI.cmake b/config/toolchain/pgi.cmake index ec58cbb..ec58cbb 100644 --- a/config/toolchain/PGI.cmake +++ b/config/toolchain/pgi.cmake |