mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-01 19:30:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

CUDA: Move VS CudaRuntime selection to be with rest of CUDA options

Browse Source
This commit is contained in:
Brad King
2020-05-22 07:01:55 -04:00
parent 4468acb979
commit 5c7ca6f8a8
3 changed files with 11 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Source/cmVisualStudio10TargetGenerator.cxx
View File

@@ -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);

21
Source/cmVisualStudioGeneratorOptions.cxx
View File

@@ -151,27 +151,6 @@ bool cmVisualStudioGeneratorOptions::UsingSBCS() const
return false;
}
void cmVisualStudioGeneratorOptions::FixCudaRuntime(cmGeneratorTarget* target)
{
std::map<std::string, FlagValue>::const_iterator i =
this->FlagMap.find("CudaRuntime");
if (i == this->FlagMap.end()) {
// User didn't provide am override so get the property value
std::string const& cudaRuntime =
target->GetRuntimeLinkLibrary("CUDA", this->Configuration);
if (cudaRuntime == "STATIC") {
this->AddFlag("CudaRuntime", "Static");
} else if (cudaRuntime == "SHARED") {
this->AddFlag("CudaRuntime", "Shared");
} else if (cudaRuntime == "NONE") {
this->AddFlag("CudaRuntime", "None");
} else {
// nvcc default is static
this->AddFlag("CudaRuntime", "Static");
}
}
}
void cmVisualStudioGeneratorOptions::FixCudaCodeGeneration()
{
// Extract temporary values stored by our flag table.

1
Source/cmVisualStudioGeneratorOptions.h
View File

@@ -63,7 +63,6 @@ public:
bool UsingSBCS() const;
void FixCudaCodeGeneration();
void FixCudaRuntime(cmGeneratorTarget* target);
void FixManifestUACFlags();