From e8c0ebcfdc29022f7f5c712621c6e873089d8975 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Szil=C3=A1rd=20P=C3=A1ll?= Date: Sat, 24 Oct 2020 12:05:08 +0000 Subject: [PATCH] Exclude CUDA 10.2 as well from C++17 compilation This commit corrects compilation with CUDA 10.2, which does not support C++17, by changing the condition to pass -std=c++14 to nvcc added by commit b6172240bfb5daf80d32150924bcdc46a4b07e10. --- cmake/gmxManageNvccConfig.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/gmxManageNvccConfig.cmake b/cmake/gmxManageNvccConfig.cmake index e0ce2f3481..8982467629 100644 --- a/cmake/gmxManageNvccConfig.cmake +++ b/cmake/gmxManageNvccConfig.cmake @@ -152,8 +152,8 @@ endif() # FindCUDA.cmake is unaware of the mechanism used by cmake to embed # the compiler flag for the required C++ standard in the generated # build files, so we have to pass it ourselves -if (CUDA_VERSION VERSION_LESS 10.2) - # CUDA doesn't formally support C++17 until version 10.2, so for +if (CUDA_VERSION VERSION_LESS 11.0) + # CUDA doesn't formally support C++17 until version 11.0, so for # now host-side code that compiles with CUDA is restricted to # C++14. This needs to be expressed formally for older CUDA # version. -- 2.22.0