diff options
author | Brad King <brad.king@kitware.com> | 2021-03-11 13:09:17 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2021-03-11 13:09:33 (GMT) |
commit | 33900e3c7c59d927c3d674bbba7320cf7b2e8bf9 (patch) | |
tree | 1530ca14f19f2433679cd6d1a0e3692ec51c54ae /Modules/CMakeCXXCompilerId.cpp.in | |
parent | 8dacf533a90a89c6812e9081c3632c9f60158bc0 (diff) | |
parent | 13144e82cdb29490ac34251b7c48a0260d4d54cf (diff) | |
download | CMake-33900e3c7c59d927c3d674bbba7320cf7b2e8bf9.zip CMake-33900e3c7c59d927c3d674bbba7320cf7b2e8bf9.tar.gz CMake-33900e3c7c59d927c3d674bbba7320cf7b2e8bf9.tar.bz2 |
Merge topic 'cray-compiler-wrapper-detection'
13144e82cd Cray: Enable Cray compiler wrapper detection on all platforms
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5897
Diffstat (limited to 'Modules/CMakeCXXCompilerId.cpp.in')
-rw-r--r-- | Modules/CMakeCXXCompilerId.cpp.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/CMakeCXXCompilerId.cpp.in b/Modules/CMakeCXXCompilerId.cpp.in index c3517b5..a67caba 100644 --- a/Modules/CMakeCXXCompilerId.cpp.in +++ b/Modules/CMakeCXXCompilerId.cpp.in @@ -20,7 +20,7 @@ char const* info_simulate = "INFO" ":" "simulate[" SIMULATE_ID "]"; char const* qnxnto = "INFO" ":" "qnxnto[]"; #endif -#if defined(__CRAYXE) || defined(__CRAYXC) +#if defined(__CRAYXT_COMPUTE_LINUX_TARGET) char const *info_cray = "INFO" ":" "compiler_wrapper[CrayPrgEnv]"; #endif @@ -78,7 +78,7 @@ int main(int argc, char* argv[]) #ifdef SIMULATE_VERSION_MAJOR require += info_simulate_version[argc]; #endif -#if defined(__CRAYXE) || defined(__CRAYXC) +#if defined(__CRAYXT_COMPUTE_LINUX_TARGET) require += info_cray[argc]; #endif require += info_language_dialect_default[argc]; |