diff options
| author | Brad King <brad.king@kitware.com> | 2020-01-28 15:52:23 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-01-28 15:52:33 (GMT) |
| commit | 1f9321c68399c8cc37a2cb9c78ef45949412bd7b (patch) | |
| tree | d6119155229ec9948d8c1e6d1399bf7139b5d4db /Source/cmVisualStudio10TargetGenerator.cxx | |
| parent | 2e4a948fb821612d8317f7fe4a33792af73472d1 (diff) | |
| parent | 0d0145138fe7cd60edc7f0b97e860e9a4fae1555 (diff) | |
| download | CMake-1f9321c68399c8cc37a2cb9c78ef45949412bd7b.zip CMake-1f9321c68399c8cc37a2cb9c78ef45949412bd7b.tar.gz CMake-1f9321c68399c8cc37a2cb9c78ef45949412bd7b.tar.bz2 | |
Merge topic 'cuda_runtime_library_controls'
0d0145138f CUDA: Add abstraction for cuda runtime selection
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4178
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 6761c64..5ef5597 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -3650,18 +3650,7 @@ bool cmVisualStudio10TargetGenerator::ComputeLinkOptions( this->AddLibraries(cli, libVec, vsTargetVec, config); if (cmContains(linkClosure->Languages, "CUDA") && this->CudaOptions[config] != nullptr) { - switch (this->CudaOptions[config]->GetCudaRuntime()) { - case cmVisualStudioGeneratorOptions::CudaRuntimeStatic: - libVec.push_back("cudadevrt.lib"); - libVec.push_back("cudart_static.lib"); - break; - case cmVisualStudioGeneratorOptions::CudaRuntimeShared: - libVec.push_back("cudadevrt.lib"); - libVec.push_back("cudart.lib"); - break; - case cmVisualStudioGeneratorOptions::CudaRuntimeNone: - break; - } + this->CudaOptions[config]->FixCudaRuntime(this->GeneratorTarget); } std::string standardLibsVar = cmStrCat("CMAKE_", linkLanguage, "_STANDARD_LIBRARIES"); |