diff options
| author | Brad King <brad.king@kitware.com> | 2020-05-22 11:01:55 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-05-22 12:15:37 (GMT) |
| commit | 5c7ca6f8a87f8c673088103a4d00a176f8cd93fe (patch) | |
| tree | 9baf40ea74d319f0f9cede1eec8dfe9da37e5438 /Source/cmVisualStudio10TargetGenerator.cxx | |
| parent | 4468acb979d04fc422a1c78a89c24a26b35f3629 (diff) | |
| download | CMake-5c7ca6f8a87f8c673088103a4d00a176f8cd93fe.zip CMake-5c7ca6f8a87f8c673088103a4d00a176f8cd93fe.tar.gz CMake-5c7ca6f8a87f8c673088103a4d00a176f8cd93fe.tar.bz2 | |
CUDA: Move VS CudaRuntime selection to be with rest of CUDA options
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 97f7093..de88182 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -3130,6 +3130,17 @@ bool cmVisualStudio10TargetGenerator::ComputeCudaOptions( cudaOptions.AddIncludes(this->GetIncludes(configName, "CUDA")); cudaOptions.AddFlag("UseHostInclude", "false"); + // Add runtime library selection flag. + std::string const& cudaRuntime = + this->GeneratorTarget->GetRuntimeLinkLibrary("CUDA", configName); + if (cudaRuntime == "STATIC") { + cudaOptions.AddFlag("CudaRuntime", "Static"); + } else if (cudaRuntime == "SHARED") { + cudaOptions.AddFlag("CudaRuntime", "Shared"); + } else if (cudaRuntime == "NONE") { + cudaOptions.AddFlag("CudaRuntime", "None"); + } + this->CudaOptions[configName] = std::move(pOptions); return true; } @@ -3644,10 +3655,6 @@ bool cmVisualStudio10TargetGenerator::ComputeLinkOptions( std::vector<std::string> libVec; std::vector<std::string> vsTargetVec; this->AddLibraries(cli, libVec, vsTargetVec, config); - if (cm::contains(linkClosure->Languages, "CUDA") && - this->CudaOptions[config] != nullptr) { - this->CudaOptions[config]->FixCudaRuntime(this->GeneratorTarget); - } std::string standardLibsVar = cmStrCat("CMAKE_", linkLanguage, "_STANDARD_LIBRARIES"); std::string const& libs = this->Makefile->GetSafeDefinition(standardLibsVar); |