mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 05:40:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmState: Move CacheEntryType enum to separate namespace

Browse Source 
Port dependent code to the change.
This commit is contained in:
Stephen Kelly
2016-10-18 21:28:47 +02:00
parent a49751fb2e
commit 2fe3e55d53
50 changed files with 211 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Source/cmSetCommand.cxx
View File

@@ -64,8 +64,9 @@ bool cmSetCommand::InitialPass(std::vector<std::string> const& args,
bool cache = false; // optional
bool force = false; // optional
bool parentScope = false;
cmState::CacheEntryType type = cmState::STRING; // required if cache
const char* docstring = CM_NULLPTR; // required if cache
cmStateEnums::CacheEntryType type =
cmStateEnums::STRING; // required if cache
const char* docstring = CM_NULLPTR; // required if cache
unsigned int ignoreLastArgs = 0;
// look for PARENT_SCOPE argument
@@ -115,12 +116,12 @@ bool cmSetCommand::InitialPass(std::vector<std::string> const& args,
cmState* state = this->Makefile->GetState();
const char* existingValue = state->GetCacheEntryValue(variable);
if (existingValue &&
(state->GetCacheEntryType(variable) != cmState::UNINITIALIZED)) {
(state->GetCacheEntryType(variable) != cmStateEnums::UNINITIALIZED)) {
// if the set is trying to CACHE the value but the value
// is already in the cache and the type is not internal
// then leave now without setting any definitions in the cache
// or the makefile
if (cache && type != cmState::INTERNAL && !force) {
if (cache && type != cmStateEnums::INTERNAL && !force) {
return true;
}
}