mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-05 22:59:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

CUDA: Fix boolean interpretation of CUDA_SEPARABLE_COMPILATION

Browse Source 
If the property is explicitly set to a non-true value we should
not treat it as true.
This commit is contained in:
Brad King
2017-02-20 17:05:35 -05:00
parent 6cbad490c2
commit 08fa0b4595
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/cmMakefileTargetGenerator.cxx
View File

@@ -590,7 +590,8 @@ void cmMakefileTargetGenerator::WriteObjectBuildFile(
std::vector<std::string> compileCommands; std::vector<std::string> compileCommands;
if (lang == "CUDA") { if (lang == "CUDA") {
std::string cmdVar; std::string cmdVar;
if (this->GeneratorTarget->GetProperty("CUDA_SEPARABLE_COMPILATION")) { if (this->GeneratorTarget->GetPropertyAsBool(
"CUDA_SEPARABLE_COMPILATION")) {
cmdVar = std::string("CMAKE_CUDA_COMPILE_SEPARABLE_COMPILATION"); cmdVar = std::string("CMAKE_CUDA_COMPILE_SEPARABLE_COMPILATION");
} else { } else {
cmdVar = std::string("CMAKE_CUDA_COMPILE_WHOLE_COMPILATION"); cmdVar = std::string("CMAKE_CUDA_COMPILE_WHOLE_COMPILATION");

3
Source/cmNinjaTargetGenerator.cxx
View File

@@ -580,7 +580,8 @@ void cmNinjaTargetGenerator::WriteCompileRule(const std::string& lang)
std::vector<std::string> compileCmds; std::vector<std::string> compileCmds;
if (lang == "CUDA") { if (lang == "CUDA") {
std::string cmdVar; std::string cmdVar;
if (this->GeneratorTarget->GetProperty("CUDA_SEPARABLE_COMPILATION")) { if (this->GeneratorTarget->GetPropertyAsBool(
"CUDA_SEPARABLE_COMPILATION")) {
cmdVar = std::string("CMAKE_CUDA_COMPILE_SEPARABLE_COMPILATION"); cmdVar = std::string("CMAKE_CUDA_COMPILE_SEPARABLE_COMPILATION");
} else { } else {
cmdVar = std::string("CMAKE_CUDA_COMPILE_WHOLE_COMPILATION"); cmdVar = std::string("CMAKE_CUDA_COMPILE_WHOLE_COMPILATION");