diff options
| author | Brad King <brad.king@kitware.com> | 2020-03-12 12:25:21 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-03-12 12:26:07 (GMT) |
| commit | f86d8009c6a4482c81221114a2b04b375564cc94 (patch) | |
| tree | 3c2a0606494d0ce496f0d234ed531f0a40bf9794 /Source/cmFindPathCommand.cxx | |
| parent | 74954a6657a7b8f49ee68d61759df39c1a24e008 (diff) | |
| parent | 36a5b3d1d165830045b9d7019fbe3df250ce0685 (diff) | |
| download | CMake-f86d8009c6a4482c81221114a2b04b375564cc94.zip CMake-f86d8009c6a4482c81221114a2b04b375564cc94.tar.gz CMake-f86d8009c6a4482c81221114a2b04b375564cc94.tar.bz2 | |
Merge topic 'add-cache-definition'
36a5b3d1d1 cmMakefile::AddCacheDefinition: Add overload that accepts std::string value
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4457
Diffstat (limited to 'Source/cmFindPathCommand.cxx')
| -rw-r--r-- | Source/cmFindPathCommand.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmFindPathCommand.cxx b/Source/cmFindPathCommand.cxx index f5b52c2..4bab469 100644 --- a/Source/cmFindPathCommand.cxx +++ b/Source/cmFindPathCommand.cxx @@ -44,12 +44,12 @@ bool cmFindPathCommand::InitialPass(std::vector<std::string> const& argsIn) std::string result = this->FindHeader(); if (!result.empty()) { this->Makefile->AddCacheDefinition( - this->VariableName, result.c_str(), this->VariableDocumentation.c_str(), + this->VariableName, result, this->VariableDocumentation.c_str(), (this->IncludeFileInPath) ? cmStateEnums::FILEPATH : cmStateEnums::PATH); return true; } this->Makefile->AddCacheDefinition( - this->VariableName, (this->VariableName + "-NOTFOUND").c_str(), + this->VariableName, this->VariableName + "-NOTFOUND", this->VariableDocumentation.c_str(), (this->IncludeFileInPath) ? cmStateEnums::FILEPATH : cmStateEnums::PATH); if (this->Required) { |