summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-01-12 15:21:15 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2017-01-12 15:21:15 (GMT)
commit5e76ded22c8900a8aea3dbc76f2401f5d832298e (patch)
tree4e49ec817d939cf74b8523ad6619499028ae6522
parent2e550e36d29332adda29f85fbf79e1610286ab9b (diff)
parent1ce39a1e73d6a38ec53679113ba643ac6a51781c (diff)
downloadCMake-5e76ded22c8900a8aea3dbc76f2401f5d832298e.zip
CMake-5e76ded22c8900a8aea3dbc76f2401f5d832298e.tar.gz
CMake-5e76ded22c8900a8aea3dbc76f2401f5d832298e.tar.bz2
Merge topic 'cuda_compile_features_test_use_widely_supported_feature'
1ce39a1e CUDA: ConsumeCompileFeatures use cxx_nullptr for wider compiler support
-rw-r--r--Tests/Cuda/ConsumeCompileFeatures/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
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)