diff options
| author | Brad King <brad.king@kitware.com> | 2017-02-21 16:11:22 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-02-21 16:11:22 (GMT) |
| commit | 0f6ebb5c0fac9def6d7388e55960b92ab8f2644f (patch) | |
| tree | a23751686142506dd0cb90122d70f4b47dc3e59f /Source | |
| parent | 0b6afec62bbc66052035207ce3b6a0516144c12d (diff) | |
| parent | 08fa0b4595566a6e4c29c182865a6ec7e41d9e2e (diff) | |
| download | CMake-0f6ebb5c0fac9def6d7388e55960b92ab8f2644f.zip CMake-0f6ebb5c0fac9def6d7388e55960b92ab8f2644f.tar.gz CMake-0f6ebb5c0fac9def6d7388e55960b92ab8f2644f.tar.bz2 | |
Merge branch 'cuda-separable-bool' into release
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"); |