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 7f3e96623e6d1bc22e447926926409c2836e7d6a (commit)
via 5fddbf1382f9eca0354404ad062343da61cfc84a (commit)
from 016ec962653d5f2060ebf05d09ecddc13deb0cab (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=7f3e96623e6d1bc22e447926926409c2836e7d6a
commit 7f3e96623e6d1bc22e447926926409c2836e7d6a
Merge: 016ec96 5fddbf1
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jan 11 10:26:48 2017 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Jan 11 10:26:48 2017 -0500
Merge topic 'cuda-windows' into next
5fddbf13 fixup! CUDA: Port test cases to Windows with MSVC host compiler
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5fddbf1382f9eca0354404ad062343da61cfc84a
commit 5fddbf1382f9eca0354404ad062343da61cfc84a
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Jan 11 10:10:17 2017 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Jan 11 10:25:21 2017 -0500
fixup! CUDA: Port test cases to Windows with MSVC host compiler
diff --git a/Tests/RunCMake/try_compile/CudaStandardNoDefault.cmake
b/Tests/RunCMake/try_compile/CudaStandardNoDefault.cmake
new file mode 100644
index 0000000..ea22152
--- /dev/null
+++ b/Tests/RunCMake/try_compile/CudaStandardNoDefault.cmake
@@ -0,0 +1,9 @@
+enable_language(CUDA)
+try_compile(result ${CMAKE_CURRENT_BINARY_DIR}
+ SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src.cu
+ CUDA_STANDARD 3 # bogus, but not used
+ OUTPUT_VARIABLE out
+ )
+if(NOT result)
+ message(FATAL_ERROR "try_compile failed:\n${out}")
+endif()
diff --git a/Tests/RunCMake/try_compile/RunCMakeTest.cmake
b/Tests/RunCMake/try_compile/RunCMakeTest.cmake
index 5452e6d..6a1bc64 100644
--- a/Tests/RunCMake/try_compile/RunCMakeTest.cmake
+++ b/Tests/RunCMake/try_compile/RunCMakeTest.cmake
@@ -36,7 +36,11 @@ elseif(DEFINED CMAKE_CXX_STANDARD_DEFAULT)
run_cmake(CxxStandardNoDefault)
endif()
if(CMake_TEST_CUDA)
- run_cmake(CudaStandard)
+ if(CMAKE_HOST_WIN32)
+ run_cmake(CudaStandardNoDefault)
+ else()
+ run_cmake(CudaStandard)
+ endif()
endif()
if(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_C_COMPILER_VERSION
VERSION_LESS 4.4)
run_cmake(CStandardGNU)
-----------------------------------------------------------------------
Summary of changes:
.../{CxxStandardNoDefault.cmake => CudaStandardNoDefault.cmake} | 6 +++---
Tests/RunCMake/try_compile/RunCMakeTest.cmake | 6 +++++-
2 files changed, 8 insertions(+), 4 deletions(-)
copy Tests/RunCMake/try_compile/{CxxStandardNoDefault.cmake =>
CudaStandardNoDefault.cmake} (58%)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
