diff options
| author | Benjamin Wozniak <benjamin.wozniak@intenta.de> | 2019-08-23 06:32:28 (GMT) |
|---|---|---|
| committer | Benjamin Wozniak <benjamin.wozniak@intenta.de> | 2019-08-30 06:14:01 (GMT) |
| commit | 25f29b974182ae7da36ace86e846b4c0b2807a68 (patch) | |
| tree | 763757ec0860be30482cfa79e283bea66932e52a /Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake | |
| parent | ee86770a3f9700374820f90959a9c0fa39b27409 (diff) | |
| download | CMake-25f29b974182ae7da36ace86e846b4c0b2807a68.zip CMake-25f29b974182ae7da36ace86e846b4c0b2807a68.tar.gz CMake-25f29b974182ae7da36ace86e846b4c0b2807a68.tar.bz2 | |
cuda: Adapted tests to work with modified cuda toolset
- 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
Diffstat (limited to 'Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake')
| -rw-r--r-- | Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake b/Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake index ef8fd25..ae75561 100644 --- a/Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake +++ b/Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake @@ -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) |