Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-22 16:07:49 +08:00
Code Issues Projects Releases Wiki Activity

cuda: Adapted tests to work with modified cuda toolset

Browse Source 
- cuda version is only recognized if it contains no other characters
  than "0123456789."
- cuda path is only tested with dummy value . Otherwise a cuda toolkit
  must be copied to the integration test machine
This commit is contained in:
Benjamin Wozniak
2019-08-23 08:32:28 +02:00
parent ee86770a3f
commit 25f29b9741
7 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake
View File

@@ -6,12 +6,14 @@ run_cmake(NoToolset)
if("${RunCMake_GENERATOR}" MATCHES "Visual Studio 1[012456]")
set(RunCMake_GENERATOR_TOOLSET "Test Toolset")
run_cmake(TestToolset)
set(RunCMake_GENERATOR_TOOLSET "Test Toolset,cuda=Test Cuda")
set(RunCMake_GENERATOR_TOOLSET "Test Toolset,cuda=0.0")
run_cmake(TestToolsetCudaBoth)
set(RunCMake_GENERATOR_TOOLSET ",cuda=Test Cuda")
run_cmake(TestToolsetCudaOnly)
set(RunCMake_GENERATOR_TOOLSET "cuda=Test Cuda")
run_cmake(TestToolsetCudaOnly)
set(RunCMake_GENERATOR_TOOLSET ",cuda=0.0")
run_cmake(TestToolsetCudaVersionOnly)
set(RunCMake_GENERATOR_TOOLSET "cuda=0.0")
run_cmake(TestToolsetCudaVersionOnly)
set(RunCMake_GENERATOR_TOOLSET "cuda=C:\\dummy\\cuda")
run_cmake(TestToolsetCudaPathOnly)
if("${RunCMake_GENERATOR}" MATCHES "Visual Studio 1[2456]")
set(RunCMake_GENERATOR_TOOLSET "Test Toolset,host=x64")
run_cmake(TestToolsetHostArchBoth)

2
Tests/RunCMake/GeneratorToolset/TestToolsetCudaBoth-stdout.txt
View File

@@ -1,2 +1,2 @@
-- CMAKE_VS_PLATFORM_TOOLSET='Test Toolset'
-- CMAKE_VS_PLATFORM_TOOLSET_CUDA='Test Cuda'
-- CMAKE_VS_PLATFORM_TOOLSET_CUDA='0.0'

1
Tests/RunCMake/GeneratorToolset/TestToolsetCudaPathOnly-result.txt Normal file
View File

@@ -0,0 +1 @@
1

12
Tests/RunCMake/GeneratorToolset/TestToolsetCudaPathOnly-stderr.txt Normal file
View File

@@ -0,0 +1,12 @@
CMake Error at CMakeLists.txt:[0-9]+ \(project\):
Generator
Visual Studio .*
given toolset
cuda=C:\\dummy\\cuda\\
cannot detect Visual Studio integration files in path
C:/dummy/cuda/CUDAVisualStudioIntegration/extras/visual_studio_integration/MSBuildExtensions

1
Tests/RunCMake/GeneratorToolset/TestToolsetCudaPathOnly.cmake Normal file
View File

@@ -0,0 +1 @@
message(FATAL_ERROR "This should not be reached!")

2
Tests/RunCMake/GeneratorToolset/TestToolsetCudaOnly-stdout.txt → Tests/RunCMake/GeneratorToolset/TestToolsetCudaVersionOnly-stdout.txt
View File

@@ -1,2 +1,2 @@
-- CMAKE_VS_PLATFORM_TOOLSET='(v[0-9]+|Windows7.1SDK)'
-- CMAKE_VS_PLATFORM_TOOLSET_CUDA='Test Cuda'
-- CMAKE_VS_PLATFORM_TOOLSET_CUDA='0.0'

0
Tests/RunCMake/GeneratorToolset/TestToolsetCudaOnly.cmake → Tests/RunCMake/GeneratorToolset/TestToolsetCudaVersionOnly.cmake
View File