mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-22 22:31:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cuda-separable-bool' into release

Browse Source
This commit is contained in:
Brad King
2017-02-21 11:11:22 -05:00
parent 0b6afec62b 08fa0b4595
commit 0f6ebb5c0f
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmMakefileTargetGenerator.cxx
+2 -1
View File
@@ -590,7 +590,8 @@ void cmMakefileTargetGenerator::WriteObjectBuildFile(
std::vector<std::string> compileCommands;
if (lang == "CUDA") {
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");
} else {
cmdVar = std::string("CMAKE_CUDA_COMPILE_WHOLE_COMPILATION");
Source/cmNinjaTargetGenerator.cxx
+2 -1
View File
@@ -580,7 +580,8 @@ void cmNinjaTargetGenerator::WriteCompileRule(const std::string& lang)
std::vector<std::string> compileCmds;
if (lang == "CUDA") {
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");
} else {
cmdVar = std::string("CMAKE_CUDA_COMPILE_WHOLE_COMPILATION");