diff options
| author | Brad King <brad.king@kitware.com> | 2015-04-13 15:45:02 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-04-13 15:45:02 (GMT) |
| commit | 62c5e6f1a19df0043a0e9aaba6cf7247f76a5cc3 (patch) | |
| tree | 8ca950377efbfd2cf90c7fe61eb7ff566a121d5e /Source/cmTryRunCommand.cxx | |
| parent | 92d61798937e42ecb7ae3d1be8b2b4ab7ce15fcb (diff) | |
| parent | f081c5bdddcfcaaf5bee7b918fe5c7ff01faae35 (diff) | |
| download | CMake-62c5e6f1a19df0043a0e9aaba6cf7247f76a5cc3.zip CMake-62c5e6f1a19df0043a0e9aaba6cf7247f76a5cc3.tar.gz CMake-62c5e6f1a19df0043a0e9aaba6cf7247f76a5cc3.tar.bz2 | |
Merge topic 'introduce-cmState'
f081c5bd cmState: Move CacheEntryType enum from cmCacheManager.
f71fdf0e cmMakefile: Remove unused CacheManager accessor.
ff7169a0 Port to cmState.
a6b1ad13 Introduce cmState class.
Diffstat (limited to 'Source/cmTryRunCommand.cxx')
| -rw-r--r-- | Source/cmTryRunCommand.cxx | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/Source/cmTryRunCommand.cxx b/Source/cmTryRunCommand.cxx index 63109e0..c9e7a46 100644 --- a/Source/cmTryRunCommand.cxx +++ b/Source/cmTryRunCommand.cxx @@ -10,7 +10,6 @@ See the License for more information. ============================================================================*/ #include "cmTryRunCommand.h" -#include "cmCacheManager.h" #include "cmTryCompileCommand.h" #include <cmsys/FStream.hxx> @@ -239,7 +238,7 @@ void cmTryRunCommand::RunExecutable(const std::string& runArgs, } this->Makefile->AddCacheDefinition(this->RunResultVariable, retChar, "Result of TRY_RUN", - cmCacheManager::INTERNAL); + cmState::INTERNAL); } /* This is only used when cross compiling. Instead of running the @@ -284,14 +283,14 @@ void cmTryRunCommand::DoNotRunExecutable(const std::string& runArgs, this->Makefile->AddCacheDefinition(this->RunResultVariable, "PLEASE_FILL_OUT-FAILED_TO_RUN", comment.c_str(), - cmCacheManager::STRING); + cmState::STRING); - cmCacheManager* manager = this->Makefile->GetCacheManager(); + cmState* state = this->Makefile->GetState(); const char* existingValue - = manager->GetCacheEntryValue(this->RunResultVariable); + = state->GetCacheEntryValue(this->RunResultVariable); if (existingValue) { - manager->SetCacheEntryProperty(this->RunResultVariable, "ADVANCED", "1"); + state->SetCacheEntryProperty(this->RunResultVariable, "ADVANCED", "1"); } error = true; @@ -312,14 +311,14 @@ void cmTryRunCommand::DoNotRunExecutable(const std::string& runArgs, this->Makefile->AddCacheDefinition(internalRunOutputName, "PLEASE_FILL_OUT-NOTFOUND", comment.c_str(), - cmCacheManager::STRING); - cmCacheManager* manager = this->Makefile->GetCacheManager(); + cmState::STRING); + cmState* state = this->Makefile->GetState(); const char* existing = - manager->GetCacheEntryValue(internalRunOutputName); + state->GetCacheEntryValue(internalRunOutputName); if (existing) { - manager->SetCacheEntryProperty(internalRunOutputName, - "ADVANCED", "1"); + state->SetCacheEntryProperty(internalRunOutputName, + "ADVANCED", "1"); } error = true; |