[Cmake-commits] CMake branch, master, updated. v3.9.3-1026-g6bced4b

[Kitware Robot]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  6bced4bf76e33b5c80a9a821d99ac933afa6ac03 (commit)
       via  fe37b99473df00b69beede10ad4ed2472c375d4d (commit)
      from  e182ba735e17bd5625ddfe7f796a123a383ff02f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6bced4bf76e33b5c80a9a821d99ac933afa6ac03
commit 6bced4bf76e33b5c80a9a821d99ac933afa6ac03
Merge: e182ba7 fe37b99
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 29 13:23:31 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Sep 29 09:23:39 2017 -0400

    Merge topic 'cuda_9_support'
    
    fe37b994 CUDA: Add support for requesting C++98 under CUDA 9
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1315


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fe37b99473df00b69beede10ad4ed2472c375d4d
commit fe37b99473df00b69beede10ad4ed2472c375d4d
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Tue Sep 26 09:25:35 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 26 11:08:09 2017 -0400

    CUDA: Add support for requesting C++98 under CUDA 9
    
    Starting in CUDA 9 the default compilation mode is C++14, and you need
    to explicitly enable C++98/03 mode.
    
    While at it, document `14` among the values for `CUDA_STANDARD`.  This
    was accidentally left out of commit v3.9.0-rc1~118^2 (CUDA: Add support
    for the C++14 standard flag, 2017-05-11).

diff --git a/Help/prop_tgt/CUDA_STANDARD.rst b/Help/prop_tgt/CUDA_STANDARD.rst
index b262814..a3a2f56 100644
--- a/Help/prop_tgt/CUDA_STANDARD.rst
+++ b/Help/prop_tgt/CUDA_STANDARD.rst
@@ -7,7 +7,7 @@ This property specifies the CUDA/C++ standard whose features are requested
 to build this target.  For some compilers, this results in adding a
 flag such as ``-std=gnu++11`` to the compile line.
 
-Supported values are ``98``, ``11``.
+Supported values are ``98``, ``11``, ``14``.
 
 If the value requested does not result in a compile flag being added for
 the compiler in use, a previous standard flag will be added instead.  This
diff --git a/Modules/Compiler/NVIDIA-CUDA.cmake b/Modules/Compiler/NVIDIA-CUDA.cmake
index 785e269..1c91654 100644
--- a/Modules/Compiler/NVIDIA-CUDA.cmake
+++ b/Modules/Compiler/NVIDIA-CUDA.cmake
@@ -26,6 +26,8 @@ else()
   set(CMAKE_CUDA11_EXTENSION_COMPILE_OPTION "-std=c++11")
 
   if (NOT CMAKE_CUDA_COMPILER_VERSION VERSION_LESS 9.0)
+    set(CMAKE_CUDA98_STANDARD_COMPILE_OPTION "-std=c++03")
+    set(CMAKE_CUDA98_EXTENSION_COMPILE_OPTION "-std=c++03")
     set(CMAKE_CUDA14_STANDARD_COMPILE_OPTION "-std=c++14")
     set(CMAKE_CUDA14_EXTENSION_COMPILE_OPTION "-std=c++14")
   endif()

-----------------------------------------------------------------------

Summary of changes:
 Help/prop_tgt/CUDA_STANDARD.rst    |    2 +-
 Modules/Compiler/NVIDIA-CUDA.cmake |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake