[Cmake-commits] CMake branch, next, updated. v3.7.1-2077-gee14e5a

[Brad King]

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, next has been updated
       via  ee14e5aaa12451d93a0cc3787d2f73b2841ec950 (commit)
       via  1ce39a1e73d6a38ec53679113ba643ac6a51781c (commit)
      from  afd1fd49695b0dad9cca6f00749384568c214a9e (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=ee14e5aaa12451d93a0cc3787d2f73b2841ec950
commit ee14e5aaa12451d93a0cc3787d2f73b2841ec950
Merge: afd1fd4 1ce39a1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 11 11:14:55 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 11 11:14:55 2017 -0500

    Merge topic 'cuda_compile_features_test_use_widely_supported_feature' into next
    
    1ce39a1e CUDA: ConsumeCompileFeatures use cxx_nullptr for wider compiler support


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1ce39a1e73d6a38ec53679113ba643ac6a51781c
commit 1ce39a1e73d6a38ec53679113ba643ac6a51781c
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Wed Jan 11 10:40:38 2017 -0500
Commit:     Robert Maynard <robert.maynard at kitware.com>
CommitDate: Wed Jan 11 10:40:38 2017 -0500

    CUDA: ConsumeCompileFeatures use cxx_nullptr for wider compiler support
    
    We need to use a C++11 feature that is supported by the widest
    range of compilers, so we chose nullptr instead of constexpr.

diff --git a/Tests/Cuda/ConsumeCompileFeatures/CMakeLists.txt b/Tests/Cuda/ConsumeCompileFeatures/CMakeLists.txt
index 8361b9e..9fda2d0 100644
--- a/Tests/Cuda/ConsumeCompileFeatures/CMakeLists.txt
+++ b/Tests/Cuda/ConsumeCompileFeatures/CMakeLists.txt
@@ -11,7 +11,7 @@ project (CudaConsumeCompileFeatures CXX CUDA)
 
 
 add_library(CudaConsumeLib STATIC static.cpp static.cu)
-target_compile_features(CudaConsumeLib PUBLIC cxx_constexpr)
+target_compile_features(CudaConsumeLib PUBLIC cxx_nullptr)
 
 add_executable(CudaConsumeCompileFeatures main.cu)
 target_link_libraries(CudaConsumeCompileFeatures PRIVATE CudaConsumeLib)

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

Summary of changes:
 Tests/Cuda/ConsumeCompileFeatures/CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake