diff options
author | Brad King <brad.king@kitware.com> | 2019-06-26 12:43:19 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2019-06-26 12:43:19 (GMT) |
commit | d9a9150351212348c0fc663b0f31fcb0e1b5c42e (patch) | |
tree | fb848feab65720056ad5504d0b4de951ae2316ef /Tests | |
parent | 2bbbc4ce1ff7d7d0cbbdc1d89cff023b754cc35f (diff) | |
parent | 8fbd25772f7db4c6f152a28b0050e6b263951049 (diff) | |
download | CMake-d9a9150351212348c0fc663b0f31fcb0e1b5c42e.zip CMake-d9a9150351212348c0fc663b0f31fcb0e1b5c42e.tar.gz CMake-d9a9150351212348c0fc663b0f31fcb0e1b5c42e.tar.bz2 |
Merge branch 'cuda-msvc-runtime-library' into release-3.15
Merge-request: !3485
Diffstat (limited to 'Tests')
-rw-r--r-- | Tests/CMakeLists.txt | 1 | ||||
-rw-r--r-- | Tests/MSVCRuntimeLibrary/CMakeLists.txt | 7 | ||||
-rw-r--r-- | Tests/MSVCRuntimeLibrary/verify.cu | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 920af04..e73b277 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -2001,6 +2001,7 @@ ${CMake_SOURCE_DIR}/Utilities/Release/push.bash --dir dev -- '${CMake_BUILD_NIGH if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") ADD_TEST_MACRO(PrecompiledHeader foo) endif() + set(MSVCRuntimeLibrary_BUILD_OPTIONS -DCMake_TEST_CUDA=${CMake_TEST_CUDA}) ADD_TEST_MACRO(MSVCRuntimeLibrary) if(CMAKE_Fortran_COMPILER) ADD_TEST_MACRO(MSVCRuntimeLibrary.Fortran) diff --git a/Tests/MSVCRuntimeLibrary/CMakeLists.txt b/Tests/MSVCRuntimeLibrary/CMakeLists.txt index 6994d8d..f7d9fec 100644 --- a/Tests/MSVCRuntimeLibrary/CMakeLists.txt +++ b/Tests/MSVCRuntimeLibrary/CMakeLists.txt @@ -2,6 +2,10 @@ cmake_minimum_required(VERSION 3.14) cmake_policy(SET CMP0091 NEW) project(MSVCRuntimeLibrary) +if(CMake_TEST_CUDA) + enable_language(CUDA) +endif() + function(verify_combinations threads lang src) set(verify_tc_config_ Release) set(verify_tc_config_Debug Debug) @@ -62,3 +66,6 @@ endfunction() verify(C verify.c) verify(CXX verify.cxx) +if(CMake_TEST_CUDA) + verify(CUDA verify.cu) +endif() diff --git a/Tests/MSVCRuntimeLibrary/verify.cu b/Tests/MSVCRuntimeLibrary/verify.cu new file mode 100644 index 0000000..741bca6 --- /dev/null +++ b/Tests/MSVCRuntimeLibrary/verify.cu @@ -0,0 +1 @@ +#include "verify.h" |