diff options
| author | Brad King <brad.king@kitware.com> | 2020-04-30 13:58:38 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-04-30 13:58:47 (GMT) |
| commit | 2743ed54dda7342b3c8fe802d082476301e8d57f (patch) | |
| tree | db4e8a5d4d8186a8877b8267e30b9d5734044b08 /Source/cmLocalUnixMakefileGenerator3.cxx | |
| parent | e16c318331c083f84a449dcf2385b51d85af5b48 (diff) | |
| parent | 36aba01223cfb28ee574386cd91dbfccc4dc9359 (diff) | |
| download | CMake-2743ed54dda7342b3c8fe802d082476301e8d57f.zip CMake-2743ed54dda7342b3c8fe802d082476301e8d57f.tar.gz CMake-2743ed54dda7342b3c8fe802d082476301e8d57f.tar.bz2 | |
Merge topic 'cmprop-gt'
36aba01223 cmGeneratorTarget::GetProperty: return cmProp
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4686
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator3.cxx')
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 1401e29..4c7c8c4 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -1546,10 +1546,8 @@ void cmLocalUnixMakefileGenerator3::WriteLocalAllRules( std::vector<std::string> commands; std::vector<std::string> depends; - const char* text = gt->GetProperty("EchoString"); - if (!text) { - text = "Running external command ..."; - } + cmProp p = gt->GetProperty("EchoString"); + const char* text = p ? p->c_str() : "Running external command ..."; depends.reserve(gt->GetUtilities().size()); for (BT<std::pair<std::string, bool>> const& u : gt->GetUtilities()) { depends.push_back(u.Value.first); @@ -1870,9 +1868,9 @@ void cmLocalUnixMakefileGenerator3::WriteDependLanguageInfo( this->Makefile->GetProperty("IMPLICIT_DEPENDS_INCLUDE_TRANSFORM")) { cmExpandList(*xform, transformRules); } - if (const char* xform = + if (cmProp xform = target->GetProperty("IMPLICIT_DEPENDS_INCLUDE_TRANSFORM")) { - cmExpandList(xform, transformRules); + cmExpandList(*xform, transformRules); } if (!transformRules.empty()) { cmakefileStream << "set(CMAKE_INCLUDE_TRANSFORMS\n"; |