diff options
| author | Brad King <brad.king@kitware.com> | 2017-02-21 16:13:58 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2017-02-21 16:13:58 (GMT) |
| commit | 48ef9c5ae64da6cfe1470f4420abd29263ec2c92 (patch) | |
| tree | 5fe87ccb618b39266779f35e77fed29689e8423a /Source | |
| parent | 8209b3238f07f5f4e8bd52d9e7f9b7c8af6ac7ba (diff) | |
| parent | 08fa0b4595566a6e4c29c182865a6ec7e41d9e2e (diff) | |
| download | CMake-48ef9c5ae64da6cfe1470f4420abd29263ec2c92.zip CMake-48ef9c5ae64da6cfe1470f4420abd29263ec2c92.tar.gz CMake-48ef9c5ae64da6cfe1470f4420abd29263ec2c92.tar.bz2 | |
Merge topic 'cuda-separable-bool'
08fa0b45 CUDA: Fix boolean interpretation of CUDA_SEPARABLE_COMPILATION
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 3 | ||||
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 866c132..54b3f36 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -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"); diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index 0b33b19..f096416 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -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"); |