Fixes NVIDIA HPC compiler and Intel ICC compatibility (#2732)

* Fixes NVIDIA HPC compiler and Intel ICC compatibility

* Fixes NVIDIA HPC compiler and Intel ICC compatibility

* Rename FMT_NVHPC_VERSION to FMT_NVCOMPILER_VERSION

Co-authored-by: Federico Busato <fbusato@nvidia.com>
This commit is contained in:
Federico
2022-01-26 15:53:04 -08:00
committed by GitHub
co-authored by Federico Busato
parent a7aecbfcaa
commit b00a1eac75
2 changed files with 13 additions and 4 deletions
+8 -1
View File
@@ -49,6 +49,13 @@
# define FMT_ICC_VERSION 0
#endif
#ifdef __NVCOMPILER
# define FMT_NVCOMPILER_VERSION \
(__NVCOMPILER_MAJOR__ * 100 + __NVCOMPILER_MINOR__)
#else
# define FMT_NVCOMPILER_VERSION 0
#endif
#ifdef __NVCC__
# define FMT_NVCC __NVCC__
#else
@@ -287,7 +294,7 @@
// Enable minimal optimizations for more compact code in debug mode.
FMT_GCC_PRAGMA("GCC push_options")
#ifndef __OPTIMIZE__
#if !defined(__OPTIMIZE__) && !FMT_NVCOMPILER_VERSION
FMT_GCC_PRAGMA("GCC optimize(\"Og\")")
#endif