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/cmake/HDFCompilerFlags.cmake | |
| 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/cmake/HDFCompilerFlags.cmake')
| -rw-r--r-- | config/cmake/HDFCompilerFlags.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/cmake/HDFCompilerFlags.cmake b/config/cmake/HDFCompilerFlags.cmake index 504c163..7a9a62e 100644 --- a/config/cmake/HDFCompilerFlags.cmake +++ b/config/cmake/HDFCompilerFlags.cmake @@ -155,7 +155,7 @@ else () # gcc automatically inlines based on the optimization level # this is just a failsafe list (APPEND H5_CFLAGS "-finline-functions") - elseif (CMAKE_C_COMPILER_ID MATCHES "[Cc]lang") + elseif (CMAKE_C_COMPILER_ID MATCHES "IntelLLVM" OR CMAKE_C_COMPILER_ID MATCHES "[Cc]lang") ADD_H5_FLAGS (HDF5_CMAKE_C_FLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/general") ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/error-general") elseif (CMAKE_C_COMPILER_ID STREQUAL "PGI") @@ -183,13 +183,13 @@ if (HDF5_ENABLE_DEV_WARNINGS) endif () elseif (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8) ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-general") - elseif (CMAKE_C_COMPILER_ID MATCHES "[Cc]lang") + elseif (CMAKE_C_COMPILER_ID MATCHES "IntelLLVM" OR CMAKE_C_COMPILER_ID MATCHES "[Cc]lang") ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/developer-general") endif () else () if (CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8) ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-general") - elseif (CMAKE_C_COMPILER_ID MATCHES "[Cc]lang") + elseif (CMAKE_C_COMPILER_ID MATCHES "IntelLLVM" OR CMAKE_C_COMPILER_ID MATCHES "[Cc]lang") ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/no-developer-general") endif () endif () |