diff options
| author | Brad King <brad.king@kitware.com> | 2014-04-29 13:36:55 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-04-29 13:36:55 (GMT) |
| commit | bbc358c3fc1f09fe2a483996ae1359dba3f587f4 (patch) | |
| tree | acbe60addb92ac90fc7c91f187a9d9226c2a95dd /Source/cmFindProgramCommand.cxx | |
| parent | 0cce556b5fbe629dccee294aeece7c275343ed64 (diff) | |
| parent | c51d07d4397ceed55c534a036ef81df44b741ff6 (diff) | |
| download | CMake-bbc358c3fc1f09fe2a483996ae1359dba3f587f4.zip CMake-bbc358c3fc1f09fe2a483996ae1359dba3f587f4.tar.gz CMake-bbc358c3fc1f09fe2a483996ae1359dba3f587f4.tar.bz2 | |
Merge branch 'master' into osx-init-early
Resolve conflict in Source/cmGlobalGenerator.cxx by integrating
changes from both sides.
Diffstat (limited to 'Source/cmFindProgramCommand.cxx')
| -rw-r--r-- | Source/cmFindProgramCommand.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmFindProgramCommand.cxx b/Source/cmFindProgramCommand.cxx index bb27753..f6e37f6 100644 --- a/Source/cmFindProgramCommand.cxx +++ b/Source/cmFindProgramCommand.cxx @@ -35,7 +35,7 @@ bool cmFindProgramCommand // value. if(this->AlreadyInCacheWithoutMetaInfo) { - this->Makefile->AddCacheDefinition(this->VariableName.c_str(), "", + this->Makefile->AddCacheDefinition(this->VariableName, "", this->VariableDocumentation.c_str(), cmCacheManager::FILEPATH); } @@ -46,14 +46,14 @@ bool cmFindProgramCommand if(result != "") { // Save the value in the cache - this->Makefile->AddCacheDefinition(this->VariableName.c_str(), + this->Makefile->AddCacheDefinition(this->VariableName, result.c_str(), this->VariableDocumentation.c_str(), cmCacheManager::FILEPATH); return true; } - this->Makefile->AddCacheDefinition(this->VariableName.c_str(), + this->Makefile->AddCacheDefinition(this->VariableName, (this->VariableName + "-NOTFOUND").c_str(), this->VariableDocumentation.c_str(), cmCacheManager::FILEPATH); |