cmState: Move CacheEntryType enum from cmCacheManager.
This commit is contained in:
parent
f71fdf0ec8
commit
f081c5bddd
|
@ -16,7 +16,7 @@ cmCursesBoolWidget::cmCursesBoolWidget(int width, int height,
|
||||||
int left, int top) :
|
int left, int top) :
|
||||||
cmCursesWidget(width, height, left, top)
|
cmCursesWidget(width, height, left, top)
|
||||||
{
|
{
|
||||||
this->Type = cmCacheManager::BOOL;
|
this->Type = cmState::BOOL;
|
||||||
set_field_fore(this->Field, A_NORMAL);
|
set_field_fore(this->Field, A_NORMAL);
|
||||||
set_field_back(this->Field, A_STANDOUT);
|
set_field_back(this->Field, A_STANDOUT);
|
||||||
field_opts_off(this->Field, O_STATIC);
|
field_opts_off(this->Field, O_STATIC);
|
||||||
|
|
|
@ -55,7 +55,7 @@ cmCursesCacheEntryComposite::cmCursesCacheEntryComposite(
|
||||||
assert(value);
|
assert(value);
|
||||||
switch (cm->GetState()->GetCacheEntryType(key))
|
switch (cm->GetState()->GetCacheEntryType(key))
|
||||||
{
|
{
|
||||||
case cmCacheManager::BOOL:
|
case cmState::BOOL:
|
||||||
this->Entry = new cmCursesBoolWidget(this->EntryWidth, 1, 1, 1);
|
this->Entry = new cmCursesBoolWidget(this->EntryWidth, 1, 1, 1);
|
||||||
if (cmSystemTools::IsOn(value))
|
if (cmSystemTools::IsOn(value))
|
||||||
{
|
{
|
||||||
|
@ -66,15 +66,15 @@ cmCursesCacheEntryComposite::cmCursesCacheEntryComposite(
|
||||||
static_cast<cmCursesBoolWidget*>(this->Entry)->SetValueAsBool(false);
|
static_cast<cmCursesBoolWidget*>(this->Entry)->SetValueAsBool(false);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case cmCacheManager::PATH:
|
case cmState::PATH:
|
||||||
this->Entry = new cmCursesPathWidget(this->EntryWidth, 1, 1, 1);
|
this->Entry = new cmCursesPathWidget(this->EntryWidth, 1, 1, 1);
|
||||||
static_cast<cmCursesPathWidget*>(this->Entry)->SetString(value);
|
static_cast<cmCursesPathWidget*>(this->Entry)->SetString(value);
|
||||||
break;
|
break;
|
||||||
case cmCacheManager::FILEPATH:
|
case cmState::FILEPATH:
|
||||||
this->Entry = new cmCursesFilePathWidget(this->EntryWidth, 1, 1, 1);
|
this->Entry = new cmCursesFilePathWidget(this->EntryWidth, 1, 1, 1);
|
||||||
static_cast<cmCursesFilePathWidget*>(this->Entry)->SetString(value);
|
static_cast<cmCursesFilePathWidget*>(this->Entry)->SetString(value);
|
||||||
break;
|
break;
|
||||||
case cmCacheManager::STRING:
|
case cmState::STRING:
|
||||||
{
|
{
|
||||||
const char* stringsProp = cm->GetState()
|
const char* stringsProp = cm->GetState()
|
||||||
->GetCacheEntryProperty(key, "STRINGS");
|
->GetCacheEntryProperty(key, "STRINGS");
|
||||||
|
@ -99,7 +99,7 @@ cmCursesCacheEntryComposite::cmCursesCacheEntryComposite(
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case cmCacheManager::UNINITIALIZED:
|
case cmState::UNINITIALIZED:
|
||||||
cmSystemTools::Error("Found an undefined variable: ",
|
cmSystemTools::Error("Found an undefined variable: ",
|
||||||
key.c_str());
|
key.c_str());
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -12,7 +12,6 @@
|
||||||
#ifndef cmCursesCacheEntryComposite_h
|
#ifndef cmCursesCacheEntryComposite_h
|
||||||
#define cmCursesCacheEntryComposite_h
|
#define cmCursesCacheEntryComposite_h
|
||||||
|
|
||||||
#include "../cmCacheManager.h"
|
|
||||||
#include "cmCursesLabelWidget.h"
|
#include "cmCursesLabelWidget.h"
|
||||||
|
|
||||||
class cmCursesCacheEntryComposite
|
class cmCursesCacheEntryComposite
|
||||||
|
|
|
@ -15,7 +15,7 @@ cmCursesDummyWidget::cmCursesDummyWidget(int width, int height,
|
||||||
int left, int top) :
|
int left, int top) :
|
||||||
cmCursesWidget(width, height, left, top)
|
cmCursesWidget(width, height, left, top)
|
||||||
{
|
{
|
||||||
this->Type = cmCacheManager::INTERNAL;
|
this->Type = cmState::INTERNAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -15,6 +15,6 @@ cmCursesFilePathWidget::cmCursesFilePathWidget(int width, int height,
|
||||||
int left, int top) :
|
int left, int top) :
|
||||||
cmCursesPathWidget(width, height, left, top)
|
cmCursesPathWidget(width, height, left, top)
|
||||||
{
|
{
|
||||||
this->Type = cmCacheManager::FILEPATH;
|
this->Type = cmState::FILEPATH;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,6 @@
|
||||||
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
See the License for more information.
|
See the License for more information.
|
||||||
============================================================================*/
|
============================================================================*/
|
||||||
#include "../cmCacheManager.h"
|
|
||||||
#include "../cmSystemTools.h"
|
#include "../cmSystemTools.h"
|
||||||
#include "../cmVersion.h"
|
#include "../cmVersion.h"
|
||||||
#include "../cmake.h"
|
#include "../cmake.h"
|
||||||
|
@ -118,11 +117,11 @@ void cmCursesMainForm::InitializeUI()
|
||||||
for(std::vector<std::string>::const_iterator it = cacheKeys.begin();
|
for(std::vector<std::string>::const_iterator it = cacheKeys.begin();
|
||||||
it != cacheKeys.end(); ++it)
|
it != cacheKeys.end(); ++it)
|
||||||
{
|
{
|
||||||
cmCacheManager::CacheEntryType t = this->CMakeInstance->GetState()
|
cmState::CacheEntryType t = this->CMakeInstance->GetState()
|
||||||
->GetCacheEntryType(*it);
|
->GetCacheEntryType(*it);
|
||||||
if (t != cmCacheManager::INTERNAL &&
|
if (t != cmState::INTERNAL &&
|
||||||
t != cmCacheManager::STATIC &&
|
t != cmState::STATIC &&
|
||||||
t != cmCacheManager::UNINITIALIZED)
|
t != cmState::UNINITIALIZED)
|
||||||
{
|
{
|
||||||
++count;
|
++count;
|
||||||
}
|
}
|
||||||
|
@ -148,11 +147,11 @@ void cmCursesMainForm::InitializeUI()
|
||||||
it != cacheKeys.end(); ++it)
|
it != cacheKeys.end(); ++it)
|
||||||
{
|
{
|
||||||
std::string key = *it;
|
std::string key = *it;
|
||||||
cmCacheManager::CacheEntryType t = this->CMakeInstance->GetState()
|
cmState::CacheEntryType t = this->CMakeInstance->GetState()
|
||||||
->GetCacheEntryType(*it);
|
->GetCacheEntryType(*it);
|
||||||
if (t == cmCacheManager::INTERNAL ||
|
if (t == cmState::INTERNAL ||
|
||||||
t == cmCacheManager::STATIC ||
|
t == cmState::STATIC ||
|
||||||
t == cmCacheManager::UNINITIALIZED )
|
t == cmState::UNINITIALIZED )
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -172,11 +171,11 @@ void cmCursesMainForm::InitializeUI()
|
||||||
it != cacheKeys.end(); ++it)
|
it != cacheKeys.end(); ++it)
|
||||||
{
|
{
|
||||||
std::string key = *it;
|
std::string key = *it;
|
||||||
cmCacheManager::CacheEntryType t = this->CMakeInstance->GetState()
|
cmState::CacheEntryType t = this->CMakeInstance->GetState()
|
||||||
->GetCacheEntryType(*it);
|
->GetCacheEntryType(*it);
|
||||||
if (t == cmCacheManager::INTERNAL ||
|
if (t == cmState::INTERNAL ||
|
||||||
t == cmCacheManager::STATIC ||
|
t == cmState::STATIC ||
|
||||||
t == cmCacheManager::UNINITIALIZED )
|
t == cmState::UNINITIALIZED )
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -294,9 +293,9 @@ void cmCursesMainForm::Render(int left, int top, int width, int height)
|
||||||
cmCursesWidget* cw = reinterpret_cast<cmCursesWidget*>
|
cmCursesWidget* cw = reinterpret_cast<cmCursesWidget*>
|
||||||
(field_userptr(currentField));
|
(field_userptr(currentField));
|
||||||
// If in edit mode, get out of it
|
// If in edit mode, get out of it
|
||||||
if ( cw->GetType() == cmCacheManager::STRING ||
|
if ( cw->GetType() == cmState::STRING ||
|
||||||
cw->GetType() == cmCacheManager::PATH ||
|
cw->GetType() == cmState::PATH ||
|
||||||
cw->GetType() == cmCacheManager::FILEPATH )
|
cw->GetType() == cmState::FILEPATH )
|
||||||
{
|
{
|
||||||
cmCursesStringWidget* sw = static_cast<cmCursesStringWidget*>(cw);
|
cmCursesStringWidget* sw = static_cast<cmCursesStringWidget*>(cw);
|
||||||
sw->SetInEdit(false);
|
sw->SetInEdit(false);
|
||||||
|
@ -823,7 +822,7 @@ void cmCursesMainForm::FillCacheManagerFromUI()
|
||||||
std::string newValue = (*this->Entries)[i]->Entry->GetValue();
|
std::string newValue = (*this->Entries)[i]->Entry->GetValue();
|
||||||
std::string fixedOldValue;
|
std::string fixedOldValue;
|
||||||
std::string fixedNewValue;
|
std::string fixedNewValue;
|
||||||
cmCacheManager::CacheEntryType t =
|
cmState::CacheEntryType t =
|
||||||
this->CMakeInstance->GetState()
|
this->CMakeInstance->GetState()
|
||||||
->GetCacheEntryType(cacheKey);
|
->GetCacheEntryType(cacheKey);
|
||||||
this->FixValue(t, oldValue, fixedOldValue);
|
this->FixValue(t, oldValue, fixedOldValue);
|
||||||
|
@ -841,15 +840,15 @@ void cmCursesMainForm::FillCacheManagerFromUI()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void cmCursesMainForm::FixValue(cmCacheManager::CacheEntryType type,
|
void cmCursesMainForm::FixValue(cmState::CacheEntryType type,
|
||||||
const std::string& in, std::string& out) const
|
const std::string& in, std::string& out) const
|
||||||
{
|
{
|
||||||
out = in.substr(0,in.find_last_not_of(" ")+1);
|
out = in.substr(0,in.find_last_not_of(" ")+1);
|
||||||
if(type == cmCacheManager::PATH || type == cmCacheManager::FILEPATH)
|
if(type == cmState::PATH || type == cmState::FILEPATH)
|
||||||
{
|
{
|
||||||
cmSystemTools::ConvertToUnixSlashes(out);
|
cmSystemTools::ConvertToUnixSlashes(out);
|
||||||
}
|
}
|
||||||
if(type == cmCacheManager::BOOL)
|
if(type == cmState::BOOL)
|
||||||
{
|
{
|
||||||
if(cmSystemTools::IsOff(out.c_str()))
|
if(cmSystemTools::IsOff(out.c_str()))
|
||||||
{
|
{
|
||||||
|
|
|
@ -113,7 +113,7 @@ protected:
|
||||||
// cache.
|
// cache.
|
||||||
void FillCacheManagerFromUI();
|
void FillCacheManagerFromUI();
|
||||||
// Fix formatting of values to a consistent form.
|
// Fix formatting of values to a consistent form.
|
||||||
void FixValue(cmCacheManager::CacheEntryType type,
|
void FixValue(cmState::CacheEntryType type,
|
||||||
const std::string& in, std::string& out) const;
|
const std::string& in, std::string& out) const;
|
||||||
// Re-post the existing fields. Used to toggle between
|
// Re-post the existing fields. Used to toggle between
|
||||||
// normal and advanced modes. Render() should be called
|
// normal and advanced modes. Render() should be called
|
||||||
|
|
|
@ -21,7 +21,7 @@ cmCursesOptionsWidget::cmCursesOptionsWidget(int width, int height,
|
||||||
int left, int top) :
|
int left, int top) :
|
||||||
cmCursesWidget(width, height, left, top)
|
cmCursesWidget(width, height, left, top)
|
||||||
{
|
{
|
||||||
this->Type = cmCacheManager::BOOL; // this is a bit of a hack
|
this->Type = cmState::BOOL; // this is a bit of a hack
|
||||||
// there is no option type, and string type causes ccmake to cast
|
// there is no option type, and string type causes ccmake to cast
|
||||||
// the widget into a string widget at some point. BOOL is safe for
|
// the widget into a string widget at some point. BOOL is safe for
|
||||||
// now.
|
// now.
|
||||||
|
|
|
@ -18,7 +18,7 @@ cmCursesPathWidget::cmCursesPathWidget(int width, int height,
|
||||||
int left, int top) :
|
int left, int top) :
|
||||||
cmCursesStringWidget(width, height, left, top)
|
cmCursesStringWidget(width, height, left, top)
|
||||||
{
|
{
|
||||||
this->Type = cmCacheManager::PATH;
|
this->Type = cmState::PATH;
|
||||||
this->Cycle = false;
|
this->Cycle = false;
|
||||||
this->CurrentIndex = 0;
|
this->CurrentIndex = 0;
|
||||||
}
|
}
|
||||||
|
@ -59,7 +59,7 @@ void cmCursesPathWidget::OnTab(cmCursesMainForm* fm, WINDOW* w)
|
||||||
}
|
}
|
||||||
std::vector<std::string> dirs;
|
std::vector<std::string> dirs;
|
||||||
|
|
||||||
cmSystemTools::SimpleGlob(glob, dirs, (this->Type == cmCacheManager::PATH?-1:0));
|
cmSystemTools::SimpleGlob(glob, dirs, (this->Type == cmState::PATH?-1:0));
|
||||||
if ( this->CurrentIndex < dirs.size() )
|
if ( this->CurrentIndex < dirs.size() )
|
||||||
{
|
{
|
||||||
cstr = dirs[this->CurrentIndex];
|
cstr = dirs[this->CurrentIndex];
|
||||||
|
|
|
@ -22,7 +22,7 @@ cmCursesStringWidget::cmCursesStringWidget(int width, int height,
|
||||||
cmCursesWidget(width, height, left, top)
|
cmCursesWidget(width, height, left, top)
|
||||||
{
|
{
|
||||||
this->InEdit = false;
|
this->InEdit = false;
|
||||||
this->Type = cmCacheManager::STRING;
|
this->Type = cmState::STRING;
|
||||||
set_field_fore(this->Field, A_NORMAL);
|
set_field_fore(this->Field, A_NORMAL);
|
||||||
set_field_back(this->Field, A_STANDOUT);
|
set_field_back(this->Field, A_STANDOUT);
|
||||||
field_opts_off(this->Field, O_STATIC);
|
field_opts_off(this->Field, O_STATIC);
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
#ifndef cmCursesWidget_h
|
#ifndef cmCursesWidget_h
|
||||||
#define cmCursesWidget_h
|
#define cmCursesWidget_h
|
||||||
|
|
||||||
#include "../cmCacheManager.h"
|
#include "../cmState.h"
|
||||||
#include "cmCursesStandardIncludes.h"
|
#include "cmCursesStandardIncludes.h"
|
||||||
|
|
||||||
class cmCursesMainForm;
|
class cmCursesMainForm;
|
||||||
|
@ -46,7 +46,7 @@ public:
|
||||||
/**
|
/**
|
||||||
* Get the type of the widget (STRING, PATH etc...)
|
* Get the type of the widget (STRING, PATH etc...)
|
||||||
*/
|
*/
|
||||||
cmCacheManager::CacheEntryType GetType()
|
cmState::CacheEntryType GetType()
|
||||||
{ return this->Type; }
|
{ return this->Type; }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -77,7 +77,7 @@ protected:
|
||||||
cmCursesWidget(const cmCursesWidget& from);
|
cmCursesWidget(const cmCursesWidget& from);
|
||||||
void operator=(const cmCursesWidget&);
|
void operator=(const cmCursesWidget&);
|
||||||
|
|
||||||
cmCacheManager::CacheEntryType Type;
|
cmState::CacheEntryType Type;
|
||||||
std::string Value;
|
std::string Value;
|
||||||
FIELD* Field;
|
FIELD* Field;
|
||||||
// The page in the main form this widget is in
|
// The page in the main form this widget is in
|
||||||
|
|
|
@ -200,9 +200,9 @@ void QCMake::setProperties(const QCMakePropertyList& newProps)
|
||||||
for(std::vector<std::string>::const_iterator it = cacheKeys.begin();
|
for(std::vector<std::string>::const_iterator it = cacheKeys.begin();
|
||||||
it != cacheKeys.end(); ++it)
|
it != cacheKeys.end(); ++it)
|
||||||
{
|
{
|
||||||
cmCacheManager::CacheEntryType t = state->GetCacheEntryType(*it);
|
cmState::CacheEntryType t = state->GetCacheEntryType(*it);
|
||||||
if(t == cmCacheManager::INTERNAL ||
|
if(t == cmState::INTERNAL ||
|
||||||
t == cmCacheManager::STATIC)
|
t == cmState::STATIC)
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -249,28 +249,28 @@ void QCMake::setProperties(const QCMakePropertyList& newProps)
|
||||||
this->CMakeInstance->AddCacheEntry(s.Key.toLocal8Bit().data(),
|
this->CMakeInstance->AddCacheEntry(s.Key.toLocal8Bit().data(),
|
||||||
s.Value.toBool() ? "ON" : "OFF",
|
s.Value.toBool() ? "ON" : "OFF",
|
||||||
s.Help.toLocal8Bit().data(),
|
s.Help.toLocal8Bit().data(),
|
||||||
cmCacheManager::BOOL);
|
cmState::BOOL);
|
||||||
}
|
}
|
||||||
else if(s.Type == QCMakeProperty::STRING)
|
else if(s.Type == QCMakeProperty::STRING)
|
||||||
{
|
{
|
||||||
this->CMakeInstance->AddCacheEntry(s.Key.toLocal8Bit().data(),
|
this->CMakeInstance->AddCacheEntry(s.Key.toLocal8Bit().data(),
|
||||||
s.Value.toString().toLocal8Bit().data(),
|
s.Value.toString().toLocal8Bit().data(),
|
||||||
s.Help.toLocal8Bit().data(),
|
s.Help.toLocal8Bit().data(),
|
||||||
cmCacheManager::STRING);
|
cmState::STRING);
|
||||||
}
|
}
|
||||||
else if(s.Type == QCMakeProperty::PATH)
|
else if(s.Type == QCMakeProperty::PATH)
|
||||||
{
|
{
|
||||||
this->CMakeInstance->AddCacheEntry(s.Key.toLocal8Bit().data(),
|
this->CMakeInstance->AddCacheEntry(s.Key.toLocal8Bit().data(),
|
||||||
s.Value.toString().toLocal8Bit().data(),
|
s.Value.toString().toLocal8Bit().data(),
|
||||||
s.Help.toLocal8Bit().data(),
|
s.Help.toLocal8Bit().data(),
|
||||||
cmCacheManager::PATH);
|
cmState::PATH);
|
||||||
}
|
}
|
||||||
else if(s.Type == QCMakeProperty::FILEPATH)
|
else if(s.Type == QCMakeProperty::FILEPATH)
|
||||||
{
|
{
|
||||||
this->CMakeInstance->AddCacheEntry(s.Key.toLocal8Bit().data(),
|
this->CMakeInstance->AddCacheEntry(s.Key.toLocal8Bit().data(),
|
||||||
s.Value.toString().toLocal8Bit().data(),
|
s.Value.toString().toLocal8Bit().data(),
|
||||||
s.Help.toLocal8Bit().data(),
|
s.Help.toLocal8Bit().data(),
|
||||||
cmCacheManager::FILEPATH);
|
cmState::FILEPATH);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -286,10 +286,10 @@ QCMakePropertyList QCMake::properties() const
|
||||||
for (std::vector<std::string>::const_iterator i = cacheKeys.begin();
|
for (std::vector<std::string>::const_iterator i = cacheKeys.begin();
|
||||||
i != cacheKeys.end(); ++i)
|
i != cacheKeys.end(); ++i)
|
||||||
{
|
{
|
||||||
cmCacheManager::CacheEntryType t = state->GetCacheEntryType(*i);
|
cmState::CacheEntryType t = state->GetCacheEntryType(*i);
|
||||||
if(t == cmCacheManager::INTERNAL ||
|
if(t == cmState::INTERNAL ||
|
||||||
t == cmCacheManager::STATIC ||
|
t == cmState::STATIC ||
|
||||||
t == cmCacheManager::UNINITIALIZED)
|
t == cmState::UNINITIALIZED)
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -302,20 +302,20 @@ QCMakePropertyList QCMake::properties() const
|
||||||
state->GetCacheEntryProperty(*i, "HELPSTRING"));
|
state->GetCacheEntryProperty(*i, "HELPSTRING"));
|
||||||
prop.Value = QString::fromLocal8Bit(cachedValue);
|
prop.Value = QString::fromLocal8Bit(cachedValue);
|
||||||
prop.Advanced = state->GetCacheEntryPropertyAsBool(*i, "ADVANCED");
|
prop.Advanced = state->GetCacheEntryPropertyAsBool(*i, "ADVANCED");
|
||||||
if(t == cmCacheManager::BOOL)
|
if(t == cmState::BOOL)
|
||||||
{
|
{
|
||||||
prop.Type = QCMakeProperty::BOOL;
|
prop.Type = QCMakeProperty::BOOL;
|
||||||
prop.Value = cmSystemTools::IsOn(cachedValue);
|
prop.Value = cmSystemTools::IsOn(cachedValue);
|
||||||
}
|
}
|
||||||
else if(t == cmCacheManager::PATH)
|
else if(t == cmState::PATH)
|
||||||
{
|
{
|
||||||
prop.Type = QCMakeProperty::PATH;
|
prop.Type = QCMakeProperty::PATH;
|
||||||
}
|
}
|
||||||
else if(t == cmCacheManager::FILEPATH)
|
else if(t == cmState::FILEPATH)
|
||||||
{
|
{
|
||||||
prop.Type = QCMakeProperty::FILEPATH;
|
prop.Type = QCMakeProperty::FILEPATH;
|
||||||
}
|
}
|
||||||
else if(t == cmCacheManager::STRING)
|
else if(t == cmState::STRING)
|
||||||
{
|
{
|
||||||
prop.Type = QCMakeProperty::STRING;
|
prop.Type = QCMakeProperty::STRING;
|
||||||
const char* stringsProperty =
|
const char* stringsProperty =
|
||||||
|
|
|
@ -147,6 +147,6 @@ bool cmBuildCommand
|
||||||
makecommand.c_str(),
|
makecommand.c_str(),
|
||||||
"Command used to build entire project "
|
"Command used to build entire project "
|
||||||
"from the command line.",
|
"from the command line.",
|
||||||
cmCacheManager::STRING);
|
cmState::STRING);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,7 +39,7 @@ bool cmBuildNameCommand
|
||||||
this->Makefile->AddCacheDefinition(args[0],
|
this->Makefile->AddCacheDefinition(args[0],
|
||||||
cv.c_str(),
|
cv.c_str(),
|
||||||
"Name of build.",
|
"Name of build.",
|
||||||
cmCacheManager::STRING);
|
cmState::STRING);
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -74,7 +74,7 @@ bool cmBuildNameCommand
|
||||||
this->Makefile->AddCacheDefinition(args[0],
|
this->Makefile->AddCacheDefinition(args[0],
|
||||||
buildname.c_str(),
|
buildname.c_str(),
|
||||||
"Name of build.",
|
"Name of build.",
|
||||||
cmCacheManager::STRING);
|
cmState::STRING);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -87,27 +87,27 @@ void CCONV cmAddCacheDefinition(void *arg, const char* name,
|
||||||
{
|
{
|
||||||
case CM_CACHE_BOOL:
|
case CM_CACHE_BOOL:
|
||||||
mf->AddCacheDefinition(name,value,doc,
|
mf->AddCacheDefinition(name,value,doc,
|
||||||
cmCacheManager::BOOL);
|
cmState::BOOL);
|
||||||
break;
|
break;
|
||||||
case CM_CACHE_PATH:
|
case CM_CACHE_PATH:
|
||||||
mf->AddCacheDefinition(name,value,doc,
|
mf->AddCacheDefinition(name,value,doc,
|
||||||
cmCacheManager::PATH);
|
cmState::PATH);
|
||||||
break;
|
break;
|
||||||
case CM_CACHE_FILEPATH:
|
case CM_CACHE_FILEPATH:
|
||||||
mf->AddCacheDefinition(name,value,doc,
|
mf->AddCacheDefinition(name,value,doc,
|
||||||
cmCacheManager::FILEPATH);
|
cmState::FILEPATH);
|
||||||
break;
|
break;
|
||||||
case CM_CACHE_STRING:
|
case CM_CACHE_STRING:
|
||||||
mf->AddCacheDefinition(name,value,doc,
|
mf->AddCacheDefinition(name,value,doc,
|
||||||
cmCacheManager::STRING);
|
cmState::STRING);
|
||||||
break;
|
break;
|
||||||
case CM_CACHE_INTERNAL:
|
case CM_CACHE_INTERNAL:
|
||||||
mf->AddCacheDefinition(name,value,doc,
|
mf->AddCacheDefinition(name,value,doc,
|
||||||
cmCacheManager::INTERNAL);
|
cmState::INTERNAL);
|
||||||
break;
|
break;
|
||||||
case CM_CACHE_STATIC:
|
case CM_CACHE_STATIC:
|
||||||
mf->AddCacheDefinition(name,value,doc,
|
mf->AddCacheDefinition(name,value,doc,
|
||||||
cmCacheManager::STATIC);
|
cmState::STATIC);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2279,7 +2279,7 @@ bool cmCTest::AddVariableDefinition(const std::string &arg)
|
||||||
{
|
{
|
||||||
std::string name;
|
std::string name;
|
||||||
std::string value;
|
std::string value;
|
||||||
cmCacheManager::CacheEntryType type = cmCacheManager::UNINITIALIZED;
|
cmState::CacheEntryType type = cmState::UNINITIALIZED;
|
||||||
|
|
||||||
if (cmake::ParseCacheEntry(arg, name, value, type))
|
if (cmake::ParseCacheEntry(arg, name, value, type))
|
||||||
{
|
{
|
||||||
|
|
|
@ -22,17 +22,6 @@
|
||||||
#include <cmsys/FStream.hxx>
|
#include <cmsys/FStream.hxx>
|
||||||
#include <cmsys/RegularExpression.hxx>
|
#include <cmsys/RegularExpression.hxx>
|
||||||
|
|
||||||
const char* cmCacheManagerTypes[] =
|
|
||||||
{ "BOOL",
|
|
||||||
"PATH",
|
|
||||||
"FILEPATH",
|
|
||||||
"STRING",
|
|
||||||
"INTERNAL",
|
|
||||||
"STATIC",
|
|
||||||
"UNINITIALIZED",
|
|
||||||
0
|
|
||||||
};
|
|
||||||
|
|
||||||
cmCacheManager::cmCacheManager(cmake* cm)
|
cmCacheManager::cmCacheManager(cmake* cm)
|
||||||
{
|
{
|
||||||
this->CacheMajorVersion = 0;
|
this->CacheMajorVersion = 0;
|
||||||
|
@ -40,41 +29,6 @@ cmCacheManager::cmCacheManager(cmake* cm)
|
||||||
this->CMakeInstance = cm;
|
this->CMakeInstance = cm;
|
||||||
}
|
}
|
||||||
|
|
||||||
const char* cmCacheManager::TypeToString(cmCacheManager::CacheEntryType type)
|
|
||||||
{
|
|
||||||
if ( type > 6 )
|
|
||||||
{
|
|
||||||
return cmCacheManagerTypes[6];
|
|
||||||
}
|
|
||||||
return cmCacheManagerTypes[type];
|
|
||||||
}
|
|
||||||
|
|
||||||
cmCacheManager::CacheEntryType cmCacheManager::StringToType(const char* s)
|
|
||||||
{
|
|
||||||
int i = 0;
|
|
||||||
while(cmCacheManagerTypes[i])
|
|
||||||
{
|
|
||||||
if(strcmp(s, cmCacheManagerTypes[i]) == 0)
|
|
||||||
{
|
|
||||||
return static_cast<CacheEntryType>(i);
|
|
||||||
}
|
|
||||||
++i;
|
|
||||||
}
|
|
||||||
return STRING;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool cmCacheManager::IsType(const char* s)
|
|
||||||
{
|
|
||||||
for(int i=0; cmCacheManagerTypes[i]; ++i)
|
|
||||||
{
|
|
||||||
if(strcmp(s, cmCacheManagerTypes[i]) == 0)
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool cmCacheManager::LoadCache(const std::string& path)
|
bool cmCacheManager::LoadCache(const std::string& path)
|
||||||
{
|
{
|
||||||
std::set<std::string> emptySet;
|
std::set<std::string> emptySet;
|
||||||
|
@ -122,7 +76,7 @@ static bool ParseEntryWithoutType(const std::string& entry,
|
||||||
bool cmCacheManager::ParseEntry(const std::string& entry,
|
bool cmCacheManager::ParseEntry(const std::string& entry,
|
||||||
std::string& var,
|
std::string& var,
|
||||||
std::string& value,
|
std::string& value,
|
||||||
CacheEntryType& type)
|
cmState::CacheEntryType& type)
|
||||||
{
|
{
|
||||||
// input line is: key:type=value
|
// input line is: key:type=value
|
||||||
static cmsys::RegularExpression reg(
|
static cmsys::RegularExpression reg(
|
||||||
|
@ -134,14 +88,14 @@ bool cmCacheManager::ParseEntry(const std::string& entry,
|
||||||
if(regQuoted.find(entry))
|
if(regQuoted.find(entry))
|
||||||
{
|
{
|
||||||
var = regQuoted.match(1);
|
var = regQuoted.match(1);
|
||||||
type = cmCacheManager::StringToType(regQuoted.match(2).c_str());
|
type = cmState::StringToCacheEntryType(regQuoted.match(2).c_str());
|
||||||
value = regQuoted.match(3);
|
value = regQuoted.match(3);
|
||||||
flag = true;
|
flag = true;
|
||||||
}
|
}
|
||||||
else if (reg.find(entry))
|
else if (reg.find(entry))
|
||||||
{
|
{
|
||||||
var = reg.match(1);
|
var = reg.match(1);
|
||||||
type = cmCacheManager::StringToType(reg.match(2).c_str());
|
type = cmState::StringToCacheEntryType(reg.match(2).c_str());
|
||||||
value = reg.match(3);
|
value = reg.match(3);
|
||||||
flag = true;
|
flag = true;
|
||||||
}
|
}
|
||||||
|
@ -250,7 +204,7 @@ bool cmCacheManager::LoadCache(const std::string& path,
|
||||||
// If the entry is not internal to the cache being loaded
|
// If the entry is not internal to the cache being loaded
|
||||||
// or if it is in the list of internal entries to be
|
// or if it is in the list of internal entries to be
|
||||||
// imported, load it.
|
// imported, load it.
|
||||||
if ( internal || (e.Type != INTERNAL) ||
|
if ( internal || (e.Type != cmState::INTERNAL) ||
|
||||||
(includes.find(entryKey) != includes.end()) )
|
(includes.find(entryKey) != includes.end()) )
|
||||||
{
|
{
|
||||||
// If we are loading the cache from another project,
|
// If we are loading the cache from another project,
|
||||||
|
@ -258,7 +212,7 @@ bool cmCacheManager::LoadCache(const std::string& path,
|
||||||
// not visible in the gui
|
// not visible in the gui
|
||||||
if (!internal)
|
if (!internal)
|
||||||
{
|
{
|
||||||
e.Type = INTERNAL;
|
e.Type = cmState::INTERNAL;
|
||||||
helpString = "DO NOT EDIT, ";
|
helpString = "DO NOT EDIT, ";
|
||||||
helpString += entryKey;
|
helpString += entryKey;
|
||||||
helpString += " loaded from external file. "
|
helpString += " loaded from external file. "
|
||||||
|
@ -306,10 +260,10 @@ bool cmCacheManager::LoadCache(const std::string& path,
|
||||||
// Set as version 0.0
|
// Set as version 0.0
|
||||||
this->AddCacheEntry("CMAKE_CACHE_MINOR_VERSION", "0",
|
this->AddCacheEntry("CMAKE_CACHE_MINOR_VERSION", "0",
|
||||||
"Minor version of cmake used to create the "
|
"Minor version of cmake used to create the "
|
||||||
"current loaded cache", cmCacheManager::INTERNAL);
|
"current loaded cache", cmState::INTERNAL);
|
||||||
this->AddCacheEntry("CMAKE_CACHE_MAJOR_VERSION", "0",
|
this->AddCacheEntry("CMAKE_CACHE_MAJOR_VERSION", "0",
|
||||||
"Major version of cmake used to create the "
|
"Major version of cmake used to create the "
|
||||||
"current loaded cache", cmCacheManager::INTERNAL);
|
"current loaded cache", cmState::INTERNAL);
|
||||||
|
|
||||||
}
|
}
|
||||||
// check to make sure the cache directory has not
|
// check to make sure the cache directory has not
|
||||||
|
@ -351,7 +305,7 @@ bool cmCacheManager::ReadPropertyEntry(std::string const& entryKey,
|
||||||
CacheEntry& e)
|
CacheEntry& e)
|
||||||
{
|
{
|
||||||
// All property entries are internal.
|
// All property entries are internal.
|
||||||
if(e.Type != cmCacheManager::INTERNAL)
|
if(e.Type != cmState::INTERNAL)
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -370,7 +324,7 @@ bool cmCacheManager::ReadPropertyEntry(std::string const& entryKey,
|
||||||
// Create an entry and store the property.
|
// Create an entry and store the property.
|
||||||
CacheEntry& ne = this->Cache[key];
|
CacheEntry& ne = this->Cache[key];
|
||||||
ne.Properties.SetCMakeInstance(this->CMakeInstance);
|
ne.Properties.SetCMakeInstance(this->CMakeInstance);
|
||||||
ne.Type = cmCacheManager::UNINITIALIZED;
|
ne.Type = cmState::UNINITIALIZED;
|
||||||
ne.SetProperty(*p, e.Value.c_str());
|
ne.SetProperty(*p, e.Value.c_str());
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -427,15 +381,15 @@ bool cmCacheManager::SaveCache(const std::string& path)
|
||||||
sprintf(temp, "%d", cmVersion::GetMinorVersion());
|
sprintf(temp, "%d", cmVersion::GetMinorVersion());
|
||||||
this->AddCacheEntry("CMAKE_CACHE_MINOR_VERSION", temp,
|
this->AddCacheEntry("CMAKE_CACHE_MINOR_VERSION", temp,
|
||||||
"Minor version of cmake used to create the "
|
"Minor version of cmake used to create the "
|
||||||
"current loaded cache", cmCacheManager::INTERNAL);
|
"current loaded cache", cmState::INTERNAL);
|
||||||
sprintf(temp, "%d", cmVersion::GetMajorVersion());
|
sprintf(temp, "%d", cmVersion::GetMajorVersion());
|
||||||
this->AddCacheEntry("CMAKE_CACHE_MAJOR_VERSION", temp,
|
this->AddCacheEntry("CMAKE_CACHE_MAJOR_VERSION", temp,
|
||||||
"Major version of cmake used to create the "
|
"Major version of cmake used to create the "
|
||||||
"current loaded cache", cmCacheManager::INTERNAL);
|
"current loaded cache", cmState::INTERNAL);
|
||||||
sprintf(temp, "%d", cmVersion::GetPatchVersion());
|
sprintf(temp, "%d", cmVersion::GetPatchVersion());
|
||||||
this->AddCacheEntry("CMAKE_CACHE_PATCH_VERSION", temp,
|
this->AddCacheEntry("CMAKE_CACHE_PATCH_VERSION", temp,
|
||||||
"Patch version of cmake used to create the "
|
"Patch version of cmake used to create the "
|
||||||
"current loaded cache", cmCacheManager::INTERNAL);
|
"current loaded cache", cmState::INTERNAL);
|
||||||
|
|
||||||
// Let us store the current working directory so that if somebody
|
// Let us store the current working directory so that if somebody
|
||||||
// Copies it, he will not be surprised
|
// Copies it, he will not be surprised
|
||||||
|
@ -450,7 +404,7 @@ bool cmCacheManager::SaveCache(const std::string& path)
|
||||||
cmSystemTools::ConvertToUnixSlashes(currentcwd);
|
cmSystemTools::ConvertToUnixSlashes(currentcwd);
|
||||||
this->AddCacheEntry("CMAKE_CACHEFILE_DIR", currentcwd.c_str(),
|
this->AddCacheEntry("CMAKE_CACHEFILE_DIR", currentcwd.c_str(),
|
||||||
"This is the directory where this CMakeCache.txt"
|
"This is the directory where this CMakeCache.txt"
|
||||||
" was created", cmCacheManager::INTERNAL);
|
" was created", cmState::INTERNAL);
|
||||||
|
|
||||||
fout << "# This is the CMakeCache file.\n"
|
fout << "# This is the CMakeCache file.\n"
|
||||||
<< "# For build in directory: " << currentcwd << "\n";
|
<< "# For build in directory: " << currentcwd << "\n";
|
||||||
|
@ -484,7 +438,7 @@ bool cmCacheManager::SaveCache(const std::string& path)
|
||||||
this->Cache.begin(); i != this->Cache.end(); ++i)
|
this->Cache.begin(); i != this->Cache.end(); ++i)
|
||||||
{
|
{
|
||||||
const CacheEntry& ce = (*i).second;
|
const CacheEntry& ce = (*i).second;
|
||||||
CacheEntryType t = ce.Type;
|
cmState::CacheEntryType t = ce.Type;
|
||||||
if(!ce.Initialized)
|
if(!ce.Initialized)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
|
@ -493,7 +447,7 @@ bool cmCacheManager::SaveCache(const std::string& path)
|
||||||
"\" is uninitialized");
|
"\" is uninitialized");
|
||||||
*/
|
*/
|
||||||
}
|
}
|
||||||
else if(t != INTERNAL)
|
else if(t != cmState::INTERNAL)
|
||||||
{
|
{
|
||||||
// Format is key:type=value
|
// Format is key:type=value
|
||||||
if(const char* help = ce.GetProperty("HELPSTRING"))
|
if(const char* help = ce.GetProperty("HELPSTRING"))
|
||||||
|
@ -505,7 +459,7 @@ bool cmCacheManager::SaveCache(const std::string& path)
|
||||||
cmCacheManager::OutputHelpString(fout, "Missing description");
|
cmCacheManager::OutputHelpString(fout, "Missing description");
|
||||||
}
|
}
|
||||||
this->OutputKey(fout, i->first);
|
this->OutputKey(fout, i->first);
|
||||||
fout << ":" << cmCacheManagerTypes[t] << "=";
|
fout << ":" << cmState::CacheEntryTypeToString(t) << "=";
|
||||||
this->OutputValue(fout, ce.Value);
|
this->OutputValue(fout, ce.Value);
|
||||||
fout << "\n\n";
|
fout << "\n\n";
|
||||||
}
|
}
|
||||||
|
@ -525,9 +479,9 @@ bool cmCacheManager::SaveCache(const std::string& path)
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
CacheEntryType t = i.GetType();
|
cmState::CacheEntryType t = i.GetType();
|
||||||
this->WritePropertyEntries(fout, i);
|
this->WritePropertyEntries(fout, i);
|
||||||
if(t == cmCacheManager::INTERNAL)
|
if(t == cmState::INTERNAL)
|
||||||
{
|
{
|
||||||
// Format is key:type=value
|
// Format is key:type=value
|
||||||
if(const char* help = i.GetProperty("HELPSTRING"))
|
if(const char* help = i.GetProperty("HELPSTRING"))
|
||||||
|
@ -535,7 +489,7 @@ bool cmCacheManager::SaveCache(const std::string& path)
|
||||||
this->OutputHelpString(fout, help);
|
this->OutputHelpString(fout, help);
|
||||||
}
|
}
|
||||||
this->OutputKey(fout, i.GetName());
|
this->OutputKey(fout, i.GetName());
|
||||||
fout << ":" << cmCacheManagerTypes[t] << "=";
|
fout << ":" << cmState::CacheEntryTypeToString(t) << "=";
|
||||||
this->OutputValue(fout, i.GetValue());
|
this->OutputValue(fout, i.GetValue());
|
||||||
fout << "\n";
|
fout << "\n";
|
||||||
}
|
}
|
||||||
|
@ -677,7 +631,7 @@ void cmCacheManager::PrintCache(std::ostream& out) const
|
||||||
for(std::map<std::string, CacheEntry>::const_iterator i =
|
for(std::map<std::string, CacheEntry>::const_iterator i =
|
||||||
this->Cache.begin(); i != this->Cache.end(); ++i)
|
this->Cache.begin(); i != this->Cache.end(); ++i)
|
||||||
{
|
{
|
||||||
if((*i).second.Type != INTERNAL)
|
if((*i).second.Type != cmState::INTERNAL)
|
||||||
{
|
{
|
||||||
out << (*i).first << " = " << (*i).second.Value
|
out << (*i).first << " = " << (*i).second.Value
|
||||||
<< std::endl;
|
<< std::endl;
|
||||||
|
@ -693,7 +647,7 @@ void cmCacheManager::PrintCache(std::ostream& out) const
|
||||||
void cmCacheManager::AddCacheEntry(const std::string& key,
|
void cmCacheManager::AddCacheEntry(const std::string& key,
|
||||||
const char* value,
|
const char* value,
|
||||||
const char* helpString,
|
const char* helpString,
|
||||||
CacheEntryType type)
|
cmState::CacheEntryType type)
|
||||||
{
|
{
|
||||||
CacheEntry& e = this->Cache[key];
|
CacheEntry& e = this->Cache[key];
|
||||||
e.Properties.SetCMakeInstance(this->CMakeInstance);
|
e.Properties.SetCMakeInstance(this->CMakeInstance);
|
||||||
|
@ -708,7 +662,7 @@ void cmCacheManager::AddCacheEntry(const std::string& key,
|
||||||
}
|
}
|
||||||
e.Type = type;
|
e.Type = type;
|
||||||
// make sure we only use unix style paths
|
// make sure we only use unix style paths
|
||||||
if(type == FILEPATH || type == PATH)
|
if(type == cmState::FILEPATH || type == cmState::PATH)
|
||||||
{
|
{
|
||||||
if(e.Value.find(';') != e.Value.npos)
|
if(e.Value.find(';') != e.Value.npos)
|
||||||
{
|
{
|
||||||
|
@ -789,7 +743,7 @@ cmCacheManager::CacheEntry::GetProperty(const std::string& prop) const
|
||||||
{
|
{
|
||||||
if(prop == "TYPE")
|
if(prop == "TYPE")
|
||||||
{
|
{
|
||||||
return cmCacheManagerTypes[this->Type];
|
return cmState::CacheEntryTypeToString(this->Type);
|
||||||
}
|
}
|
||||||
else if(prop == "VALUE")
|
else if(prop == "VALUE")
|
||||||
{
|
{
|
||||||
|
@ -806,7 +760,7 @@ void cmCacheManager::CacheEntry::SetProperty(const std::string& prop,
|
||||||
{
|
{
|
||||||
if(prop == "TYPE")
|
if(prop == "TYPE")
|
||||||
{
|
{
|
||||||
this->Type = cmCacheManager::StringToType(value? value : "STRING");
|
this->Type = cmState::StringToCacheEntryType(value? value : "STRING");
|
||||||
}
|
}
|
||||||
else if(prop == "VALUE")
|
else if(prop == "VALUE")
|
||||||
{
|
{
|
||||||
|
@ -825,7 +779,7 @@ void cmCacheManager::CacheEntry::AppendProperty(const std::string& prop,
|
||||||
{
|
{
|
||||||
if(prop == "TYPE")
|
if(prop == "TYPE")
|
||||||
{
|
{
|
||||||
this->Type = cmCacheManager::StringToType(value? value : "STRING");
|
this->Type = cmState::StringToCacheEntryType(value? value : "STRING");
|
||||||
}
|
}
|
||||||
else if(prop == "VALUE")
|
else if(prop == "VALUE")
|
||||||
{
|
{
|
||||||
|
|
|
@ -14,6 +14,8 @@
|
||||||
|
|
||||||
#include "cmStandardIncludes.h"
|
#include "cmStandardIncludes.h"
|
||||||
#include "cmPropertyMap.h"
|
#include "cmPropertyMap.h"
|
||||||
|
#include "cmState.h"
|
||||||
|
|
||||||
class cmMakefile;
|
class cmMakefile;
|
||||||
class cmMarkAsAdvancedCommand;
|
class cmMarkAsAdvancedCommand;
|
||||||
class cmake;
|
class cmake;
|
||||||
|
@ -30,21 +32,22 @@ public:
|
||||||
cmCacheManager(cmake* cm);
|
cmCacheManager(cmake* cm);
|
||||||
class CacheIterator;
|
class CacheIterator;
|
||||||
friend class cmCacheManager::CacheIterator;
|
friend class cmCacheManager::CacheIterator;
|
||||||
enum CacheEntryType{ BOOL=0, PATH, FILEPATH, STRING, INTERNAL,STATIC,
|
|
||||||
UNINITIALIZED };
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
struct CacheEntry
|
struct CacheEntry
|
||||||
{
|
{
|
||||||
std::string Value;
|
std::string Value;
|
||||||
CacheEntryType Type;
|
cmState::CacheEntryType Type;
|
||||||
cmPropertyMap Properties;
|
cmPropertyMap Properties;
|
||||||
const char* GetProperty(const std::string&) const;
|
const char* GetProperty(const std::string&) const;
|
||||||
void SetProperty(const std::string& property, const char* value);
|
void SetProperty(const std::string& property, const char* value);
|
||||||
void AppendProperty(const std::string& property, const char* value,
|
void AppendProperty(const std::string& property, const char* value,
|
||||||
bool asString=false);
|
bool asString=false);
|
||||||
bool Initialized;
|
bool Initialized;
|
||||||
CacheEntry() : Value(""), Type(UNINITIALIZED), Initialized(false)
|
CacheEntry()
|
||||||
|
: Value(""),
|
||||||
|
Type(cmState::UNINITIALIZED),
|
||||||
|
Initialized(false)
|
||||||
{}
|
{}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -68,8 +71,10 @@ public:
|
||||||
const char* GetValue() const { return this->GetEntry().Value.c_str(); }
|
const char* GetValue() const { return this->GetEntry().Value.c_str(); }
|
||||||
bool GetValueAsBool() const;
|
bool GetValueAsBool() const;
|
||||||
void SetValue(const char*);
|
void SetValue(const char*);
|
||||||
CacheEntryType GetType() const { return this->GetEntry().Type; }
|
cmState::CacheEntryType GetType() const
|
||||||
void SetType(CacheEntryType ty) { this->GetEntry().Type = ty; }
|
{ return this->GetEntry().Type; }
|
||||||
|
void SetType(cmState::CacheEntryType ty)
|
||||||
|
{ this->GetEntry().Type = ty; }
|
||||||
bool Initialized() { return this->GetEntry().Initialized; }
|
bool Initialized() { return this->GetEntry().Initialized; }
|
||||||
cmCacheManager &Container;
|
cmCacheManager &Container;
|
||||||
std::map<std::string, CacheEntry>::iterator Position;
|
std::map<std::string, CacheEntry>::iterator Position;
|
||||||
|
@ -94,17 +99,6 @@ public:
|
||||||
return CacheIterator(*this);
|
return CacheIterator(*this);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Types for the cache entries. These are useful as
|
|
||||||
* hints for a cache editor program. Path should bring
|
|
||||||
* up a file chooser, BOOL a check box, and STRING a
|
|
||||||
* text entry box, FILEPATH is a full path to a file which
|
|
||||||
* can be different than just a path input
|
|
||||||
*/
|
|
||||||
static CacheEntryType StringToType(const char*);
|
|
||||||
static const char* TypeToString(CacheEntryType);
|
|
||||||
static bool IsType(const char*);
|
|
||||||
|
|
||||||
///! Load a cache for given makefile. Loads from path/CMakeCache.txt.
|
///! Load a cache for given makefile. Loads from path/CMakeCache.txt.
|
||||||
bool LoadCache(const std::string& path);
|
bool LoadCache(const std::string& path);
|
||||||
bool LoadCache(const std::string& path, bool internal,
|
bool LoadCache(const std::string& path, bool internal,
|
||||||
|
@ -134,7 +128,7 @@ public:
|
||||||
static bool ParseEntry(const std::string& entry,
|
static bool ParseEntry(const std::string& entry,
|
||||||
std::string& var,
|
std::string& var,
|
||||||
std::string& value,
|
std::string& value,
|
||||||
CacheEntryType& type);
|
cmState::CacheEntryType& type);
|
||||||
|
|
||||||
///! Get a value from the cache given a key
|
///! Get a value from the cache given a key
|
||||||
const char* GetInitializedCacheValue(const std::string& key) const;
|
const char* GetInitializedCacheValue(const std::string& key) const;
|
||||||
|
@ -155,7 +149,7 @@ public:
|
||||||
return this->GetCacheIterator(key.c_str()).GetProperty(propName);
|
return this->GetCacheIterator(key.c_str()).GetProperty(propName);
|
||||||
}
|
}
|
||||||
|
|
||||||
CacheEntryType GetCacheEntryType(std::string const& key)
|
cmState::CacheEntryType GetCacheEntryType(std::string const& key)
|
||||||
{
|
{
|
||||||
return this->GetCacheIterator(key.c_str()).GetType();
|
return this->GetCacheIterator(key.c_str()).GetType();
|
||||||
}
|
}
|
||||||
|
@ -223,7 +217,8 @@ public:
|
||||||
protected:
|
protected:
|
||||||
///! Add an entry into the cache
|
///! Add an entry into the cache
|
||||||
void AddCacheEntry(const std::string& key, const char* value,
|
void AddCacheEntry(const std::string& key, const char* value,
|
||||||
const char* helpString, CacheEntryType type);
|
const char* helpString,
|
||||||
|
cmState::CacheEntryType type);
|
||||||
|
|
||||||
///! Get a cache entry object for a key
|
///! Get a cache entry object for a key
|
||||||
CacheEntry *GetCacheEntry(const std::string& key);
|
CacheEntry *GetCacheEntry(const std::string& key);
|
||||||
|
|
|
@ -11,7 +11,6 @@
|
||||||
============================================================================*/
|
============================================================================*/
|
||||||
#include "cmCoreTryCompile.h"
|
#include "cmCoreTryCompile.h"
|
||||||
#include "cmake.h"
|
#include "cmake.h"
|
||||||
#include "cmCacheManager.h"
|
|
||||||
#include "cmLocalGenerator.h"
|
#include "cmLocalGenerator.h"
|
||||||
#include "cmGlobalGenerator.h"
|
#include "cmGlobalGenerator.h"
|
||||||
#include "cmAlgorithms.h"
|
#include "cmAlgorithms.h"
|
||||||
|
@ -527,7 +526,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
|
||||||
this->Makefile->AddCacheDefinition(argv[0],
|
this->Makefile->AddCacheDefinition(argv[0],
|
||||||
(res == 0 ? "TRUE" : "FALSE"),
|
(res == 0 ? "TRUE" : "FALSE"),
|
||||||
"Result of TRY_COMPILE",
|
"Result of TRY_COMPILE",
|
||||||
cmCacheManager::INTERNAL);
|
cmState::INTERNAL);
|
||||||
|
|
||||||
if (!outputVariable.empty())
|
if (!outputVariable.empty())
|
||||||
{
|
{
|
||||||
|
|
|
@ -222,7 +222,7 @@ void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout,
|
||||||
// in the cache
|
// in the cache
|
||||||
valueToUse = envVarValue;
|
valueToUse = envVarValue;
|
||||||
mf->AddCacheDefinition(cacheEntryName, valueToUse.c_str(),
|
mf->AddCacheDefinition(cacheEntryName, valueToUse.c_str(),
|
||||||
cacheEntryName.c_str(), cmCacheManager::STRING,
|
cacheEntryName.c_str(), cmState::STRING,
|
||||||
true);
|
true);
|
||||||
mf->GetCMakeInstance()->SaveCache(mf->GetHomeOutputDirectory());
|
mf->GetCMakeInstance()->SaveCache(mf->GetHomeOutputDirectory());
|
||||||
}
|
}
|
||||||
|
@ -243,7 +243,7 @@ void cmExtraEclipseCDT4Generator::AddEnvVar(cmGeneratedFileStream& fout,
|
||||||
{
|
{
|
||||||
valueToUse = envVarValue;
|
valueToUse = envVarValue;
|
||||||
mf->AddCacheDefinition(cacheEntryName, valueToUse.c_str(),
|
mf->AddCacheDefinition(cacheEntryName, valueToUse.c_str(),
|
||||||
cacheEntryName.c_str(), cmCacheManager::STRING,
|
cacheEntryName.c_str(), cmState::STRING,
|
||||||
true);
|
true);
|
||||||
mf->GetCMakeInstance()->SaveCache(mf->GetHomeOutputDirectory());
|
mf->GetCMakeInstance()->SaveCache(mf->GetHomeOutputDirectory());
|
||||||
}
|
}
|
||||||
|
|
|
@ -378,7 +378,7 @@ bool cmFindBase::CheckForVariableInCache()
|
||||||
// original value. Tell the subclass implementations to do
|
// original value. Tell the subclass implementations to do
|
||||||
// this.
|
// this.
|
||||||
if(cached && state->GetCacheEntryType(this->VariableName)
|
if(cached && state->GetCacheEntryType(this->VariableName)
|
||||||
== cmCacheManager::UNINITIALIZED)
|
== cmState::UNINITIALIZED)
|
||||||
{
|
{
|
||||||
this->AlreadyInCacheWithoutMetaInfo = true;
|
this->AlreadyInCacheWithoutMetaInfo = true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,7 +10,6 @@
|
||||||
See the License for more information.
|
See the License for more information.
|
||||||
============================================================================*/
|
============================================================================*/
|
||||||
#include "cmFindLibraryCommand.h"
|
#include "cmFindLibraryCommand.h"
|
||||||
#include "cmCacheManager.h"
|
|
||||||
#include <cmsys/Directory.hxx>
|
#include <cmsys/Directory.hxx>
|
||||||
#include <cmsys/stl/algorithm>
|
#include <cmsys/stl/algorithm>
|
||||||
|
|
||||||
|
@ -39,7 +38,7 @@ bool cmFindLibraryCommand
|
||||||
{
|
{
|
||||||
this->Makefile->AddCacheDefinition(this->VariableName, "",
|
this->Makefile->AddCacheDefinition(this->VariableName, "",
|
||||||
this->VariableDocumentation.c_str(),
|
this->VariableDocumentation.c_str(),
|
||||||
cmCacheManager::FILEPATH);
|
cmState::FILEPATH);
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -72,14 +71,14 @@ bool cmFindLibraryCommand
|
||||||
this->Makefile->AddCacheDefinition(this->VariableName,
|
this->Makefile->AddCacheDefinition(this->VariableName,
|
||||||
library.c_str(),
|
library.c_str(),
|
||||||
this->VariableDocumentation.c_str(),
|
this->VariableDocumentation.c_str(),
|
||||||
cmCacheManager::FILEPATH);
|
cmState::FILEPATH);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
std::string notfound = this->VariableName + "-NOTFOUND";
|
std::string notfound = this->VariableName + "-NOTFOUND";
|
||||||
this->Makefile->AddCacheDefinition(this->VariableName,
|
this->Makefile->AddCacheDefinition(this->VariableName,
|
||||||
notfound.c_str(),
|
notfound.c_str(),
|
||||||
this->VariableDocumentation.c_str(),
|
this->VariableDocumentation.c_str(),
|
||||||
cmCacheManager::FILEPATH);
|
cmState::FILEPATH);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -947,7 +947,7 @@ bool cmFindPackageCommand::FindConfig()
|
||||||
// We force the value since we do not get here if it was already set.
|
// We force the value since we do not get here if it was already set.
|
||||||
this->Makefile->AddCacheDefinition(this->Variable,
|
this->Makefile->AddCacheDefinition(this->Variable,
|
||||||
init.c_str(), help.c_str(),
|
init.c_str(), help.c_str(),
|
||||||
cmCacheManager::PATH, true);
|
cmState::PATH, true);
|
||||||
return found;
|
return found;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,6 @@
|
||||||
See the License for more information.
|
See the License for more information.
|
||||||
============================================================================*/
|
============================================================================*/
|
||||||
#include "cmFindPathCommand.h"
|
#include "cmFindPathCommand.h"
|
||||||
#include "cmCacheManager.h"
|
|
||||||
|
|
||||||
#include <cmsys/Glob.hxx>
|
#include <cmsys/Glob.hxx>
|
||||||
|
|
||||||
|
@ -41,7 +40,7 @@ bool cmFindPathCommand
|
||||||
this->VariableName, "",
|
this->VariableName, "",
|
||||||
this->VariableDocumentation.c_str(),
|
this->VariableDocumentation.c_str(),
|
||||||
(this->IncludeFileInPath ?
|
(this->IncludeFileInPath ?
|
||||||
cmCacheManager::FILEPATH :cmCacheManager::PATH)
|
cmState::FILEPATH :cmState::PATH)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
@ -54,7 +53,7 @@ bool cmFindPathCommand
|
||||||
(this->VariableName, result.c_str(),
|
(this->VariableName, result.c_str(),
|
||||||
this->VariableDocumentation.c_str(),
|
this->VariableDocumentation.c_str(),
|
||||||
(this->IncludeFileInPath) ?
|
(this->IncludeFileInPath) ?
|
||||||
cmCacheManager::FILEPATH :cmCacheManager::PATH);
|
cmState::FILEPATH :cmState::PATH);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
this->Makefile->AddCacheDefinition
|
this->Makefile->AddCacheDefinition
|
||||||
|
@ -62,7 +61,7 @@ bool cmFindPathCommand
|
||||||
(this->VariableName + "-NOTFOUND").c_str(),
|
(this->VariableName + "-NOTFOUND").c_str(),
|
||||||
this->VariableDocumentation.c_str(),
|
this->VariableDocumentation.c_str(),
|
||||||
(this->IncludeFileInPath) ?
|
(this->IncludeFileInPath) ?
|
||||||
cmCacheManager::FILEPATH :cmCacheManager::PATH);
|
cmState::FILEPATH :cmState::PATH);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,6 @@
|
||||||
See the License for more information.
|
See the License for more information.
|
||||||
============================================================================*/
|
============================================================================*/
|
||||||
#include "cmFindProgramCommand.h"
|
#include "cmFindProgramCommand.h"
|
||||||
#include "cmCacheManager.h"
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
#if defined(__APPLE__)
|
#if defined(__APPLE__)
|
||||||
|
@ -37,7 +36,7 @@ bool cmFindProgramCommand
|
||||||
{
|
{
|
||||||
this->Makefile->AddCacheDefinition(this->VariableName, "",
|
this->Makefile->AddCacheDefinition(this->VariableName, "",
|
||||||
this->VariableDocumentation.c_str(),
|
this->VariableDocumentation.c_str(),
|
||||||
cmCacheManager::FILEPATH);
|
cmState::FILEPATH);
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -49,14 +48,14 @@ bool cmFindProgramCommand
|
||||||
this->Makefile->AddCacheDefinition(this->VariableName,
|
this->Makefile->AddCacheDefinition(this->VariableName,
|
||||||
result.c_str(),
|
result.c_str(),
|
||||||
this->VariableDocumentation.c_str(),
|
this->VariableDocumentation.c_str(),
|
||||||
cmCacheManager::FILEPATH);
|
cmState::FILEPATH);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
this->Makefile->AddCacheDefinition(this->VariableName,
|
this->Makefile->AddCacheDefinition(this->VariableName,
|
||||||
(this->VariableName + "-NOTFOUND").c_str(),
|
(this->VariableName + "-NOTFOUND").c_str(),
|
||||||
this->VariableDocumentation.c_str(),
|
this->VariableDocumentation.c_str(),
|
||||||
cmCacheManager::FILEPATH);
|
cmState::FILEPATH);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -117,13 +117,13 @@ bool cmGetFilenameComponentCommand
|
||||||
{
|
{
|
||||||
this->Makefile->AddCacheDefinition
|
this->Makefile->AddCacheDefinition
|
||||||
(storeArgs, programArgs.c_str(),
|
(storeArgs, programArgs.c_str(),
|
||||||
"", args[2] == "PATH" ? cmCacheManager::FILEPATH
|
"", args[2] == "PATH" ? cmState::FILEPATH
|
||||||
: cmCacheManager::STRING);
|
: cmState::STRING);
|
||||||
}
|
}
|
||||||
this->Makefile->AddCacheDefinition
|
this->Makefile->AddCacheDefinition
|
||||||
(args[0], result.c_str(), "",
|
(args[0], result.c_str(), "",
|
||||||
args[2] == "PATH" ? cmCacheManager::FILEPATH
|
args[2] == "PATH" ? cmState::FILEPATH
|
||||||
: cmCacheManager::STRING);
|
: cmState::STRING);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -311,7 +311,7 @@ void cmGlobalGenerator::FindMakeProgram(cmMakefile* mf)
|
||||||
makeProgram += saveFile;
|
makeProgram += saveFile;
|
||||||
mf->AddCacheDefinition("CMAKE_MAKE_PROGRAM", makeProgram.c_str(),
|
mf->AddCacheDefinition("CMAKE_MAKE_PROGRAM", makeProgram.c_str(),
|
||||||
"make program",
|
"make program",
|
||||||
cmCacheManager::FILEPATH);
|
cmState::FILEPATH);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1116,7 +1116,7 @@ void cmGlobalGenerator::Configure()
|
||||||
sprintf(num,"%d",static_cast<int>(this->LocalGenerators.size()));
|
sprintf(num,"%d",static_cast<int>(this->LocalGenerators.size()));
|
||||||
this->GetCMakeInstance()->AddCacheEntry
|
this->GetCMakeInstance()->AddCacheEntry
|
||||||
("CMAKE_NUMBER_OF_LOCAL_GENERATORS", num,
|
("CMAKE_NUMBER_OF_LOCAL_GENERATORS", num,
|
||||||
"number of local generators", cmCacheManager::INTERNAL);
|
"number of local generators", cmState::INTERNAL);
|
||||||
|
|
||||||
// check for link libraries and include directories containing "NOTFOUND"
|
// check for link libraries and include directories containing "NOTFOUND"
|
||||||
// and for infinite loops
|
// and for infinite loops
|
||||||
|
@ -1894,7 +1894,7 @@ void cmGlobalGenerator::EnableLanguagesFromGenerator(cmGlobalGenerator *gen,
|
||||||
gen->GetCMakeInstance()->GetCacheDefinition("CMAKE_MAKE_PROGRAM");
|
gen->GetCMakeInstance()->GetCacheDefinition("CMAKE_MAKE_PROGRAM");
|
||||||
this->GetCMakeInstance()->AddCacheEntry("CMAKE_MAKE_PROGRAM", make,
|
this->GetCMakeInstance()->AddCacheEntry("CMAKE_MAKE_PROGRAM", make,
|
||||||
"make program",
|
"make program",
|
||||||
cmCacheManager::FILEPATH);
|
cmState::FILEPATH);
|
||||||
// copy the enabled languages
|
// copy the enabled languages
|
||||||
this->LanguageEnabled = gen->LanguageEnabled;
|
this->LanguageEnabled = gen->LanguageEnabled;
|
||||||
this->LanguagesReady = gen->LanguagesReady;
|
this->LanguagesReady = gen->LanguagesReady;
|
||||||
|
|
|
@ -97,7 +97,7 @@ std::string cmGlobalUnixMakefileGenerator3::GetEditCacheCommand() const
|
||||||
{
|
{
|
||||||
cm->AddCacheEntry
|
cm->AddCacheEntry
|
||||||
("CMAKE_EDIT_COMMAND", editCacheCommand.c_str(),
|
("CMAKE_EDIT_COMMAND", editCacheCommand.c_str(),
|
||||||
"Path to cache edit program executable.", cmCacheManager::INTERNAL);
|
"Path to cache edit program executable.", cmState::INTERNAL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const char* edit_cmd = cm->GetCacheDefinition("CMAKE_EDIT_COMMAND");
|
const char* edit_cmd = cm->GetCacheDefinition("CMAKE_EDIT_COMMAND");
|
||||||
|
|
|
@ -89,7 +89,7 @@ void cmGlobalVisualStudio7Generator
|
||||||
"Semicolon separated list of supported configuration types, "
|
"Semicolon separated list of supported configuration types, "
|
||||||
"only supports Debug, Release, MinSizeRel, and RelWithDebInfo, "
|
"only supports Debug, Release, MinSizeRel, and RelWithDebInfo, "
|
||||||
"anything else will be ignored.",
|
"anything else will be ignored.",
|
||||||
cmCacheManager::STRING);
|
cmState::STRING);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create list of configurations requested by user's cache, if any.
|
// Create list of configurations requested by user's cache, if any.
|
||||||
|
@ -109,7 +109,7 @@ void cmGlobalVisualStudio7Generator
|
||||||
mf->AddCacheDefinition
|
mf->AddCacheDefinition
|
||||||
("CMAKE_MSVCIDE_RUN_PATH", extraPath,
|
("CMAKE_MSVCIDE_RUN_PATH", extraPath,
|
||||||
"Saved environment variable CMAKE_MSVCIDE_RUN_PATH",
|
"Saved environment variable CMAKE_MSVCIDE_RUN_PATH",
|
||||||
cmCacheManager::STATIC);
|
cmState::STATIC);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -335,7 +335,7 @@ void cmGlobalVisualStudio7Generator::GenerateConfigurations(cmMakefile* mf)
|
||||||
"Semicolon separated list of supported configuration types, "
|
"Semicolon separated list of supported configuration types, "
|
||||||
"only supports Debug, Release, MinSizeRel, and RelWithDebInfo, "
|
"only supports Debug, Release, MinSizeRel, and RelWithDebInfo, "
|
||||||
"anything else will be ignored.",
|
"anything else will be ignored.",
|
||||||
cmCacheManager::STRING);
|
cmState::STRING);
|
||||||
}
|
}
|
||||||
|
|
||||||
void cmGlobalVisualStudio7Generator::Generate()
|
void cmGlobalVisualStudio7Generator::Generate()
|
||||||
|
@ -970,7 +970,7 @@ void cmGlobalVisualStudio7Generator::CreateGUID(const std::string& name)
|
||||||
ret = cmSystemTools::UpperCase(ret);
|
ret = cmSystemTools::UpperCase(ret);
|
||||||
this->CMakeInstance->AddCacheEntry(guidStoreName.c_str(),
|
this->CMakeInstance->AddCacheEntry(guidStoreName.c_str(),
|
||||||
ret.c_str(), "Stored GUID",
|
ret.c_str(), "Stored GUID",
|
||||||
cmCacheManager::INTERNAL);
|
cmState::INTERNAL);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::vector<std::string> *cmGlobalVisualStudio7Generator::GetConfigurations()
|
std::vector<std::string> *cmGlobalVisualStudio7Generator::GetConfigurations()
|
||||||
|
|
|
@ -285,7 +285,7 @@ void cmGlobalXCodeGenerator::EnableLanguage(std::vector<std::string>const&
|
||||||
"Semicolon separated list of supported configuration types, "
|
"Semicolon separated list of supported configuration types, "
|
||||||
"only supports Debug, Release, MinSizeRel, and RelWithDebInfo, "
|
"only supports Debug, Release, MinSizeRel, and RelWithDebInfo, "
|
||||||
"anything else will be ignored.",
|
"anything else will be ignored.",
|
||||||
cmCacheManager::STRING);
|
cmState::STRING);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
mf->AddDefinition("CMAKE_GENERATOR_NO_COMPILER_ENV", "1");
|
mf->AddDefinition("CMAKE_GENERATOR_NO_COMPILER_ENV", "1");
|
||||||
|
@ -2754,7 +2754,7 @@ std::string cmGlobalXCodeGenerator::GetOrCreateId(const std::string& name,
|
||||||
}
|
}
|
||||||
|
|
||||||
this->CMakeInstance->AddCacheEntry(guidStoreName.c_str(),
|
this->CMakeInstance->AddCacheEntry(guidStoreName.c_str(),
|
||||||
id.c_str(), "Stored Xcode object GUID", cmCacheManager::INTERNAL);
|
id.c_str(), "Stored Xcode object GUID", cmState::INTERNAL);
|
||||||
|
|
||||||
return id;
|
return id;
|
||||||
}
|
}
|
||||||
|
|
|
@ -73,7 +73,7 @@ bool cmIncludeExternalMSProjectCommand
|
||||||
std::string guidVariable = utility_name + "_GUID_CMAKE";
|
std::string guidVariable = utility_name + "_GUID_CMAKE";
|
||||||
this->Makefile->GetCMakeInstance()->AddCacheEntry(
|
this->Makefile->GetCMakeInstance()->AddCacheEntry(
|
||||||
guidVariable.c_str(), customGuid.c_str(),
|
guidVariable.c_str(), customGuid.c_str(),
|
||||||
"Stored GUID", cmCacheManager::INTERNAL);
|
"Stored GUID", cmState::INTERNAL);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create a target instance for this utility.
|
// Create a target instance for this utility.
|
||||||
|
|
|
@ -172,7 +172,7 @@ void cmLoadCacheCommand::CheckLine(const char* line)
|
||||||
// Check one line of the cache file.
|
// Check one line of the cache file.
|
||||||
std::string var;
|
std::string var;
|
||||||
std::string value;
|
std::string value;
|
||||||
cmCacheManager::CacheEntryType type = cmCacheManager::UNINITIALIZED;
|
cmState::CacheEntryType type = cmState::UNINITIALIZED;
|
||||||
if(cmake::ParseCacheEntry(line, var, value, type))
|
if(cmake::ParseCacheEntry(line, var, value, type))
|
||||||
{
|
{
|
||||||
// Found a real entry. See if this one was requested.
|
// Found a real entry. See if this one was requested.
|
||||||
|
|
|
@ -118,7 +118,7 @@ void cmLocalVisualStudio10Generator
|
||||||
AddCacheEntry(guidStoreName.c_str(),
|
AddCacheEntry(guidStoreName.c_str(),
|
||||||
parser.GUID.c_str(),
|
parser.GUID.c_str(),
|
||||||
"Stored GUID",
|
"Stored GUID",
|
||||||
cmCacheManager::INTERNAL);
|
cmState::INTERNAL);
|
||||||
}
|
}
|
||||||
|
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
|
|
|
@ -16,7 +16,6 @@
|
||||||
#include "cmMakefile.h"
|
#include "cmMakefile.h"
|
||||||
#include "cmSystemTools.h"
|
#include "cmSystemTools.h"
|
||||||
#include "cmSourceFile.h"
|
#include "cmSourceFile.h"
|
||||||
#include "cmCacheManager.h"
|
|
||||||
#include "cmGeneratorTarget.h"
|
#include "cmGeneratorTarget.h"
|
||||||
#include "cmCustomCommandGenerator.h"
|
#include "cmCustomCommandGenerator.h"
|
||||||
#include "cmake.h"
|
#include "cmake.h"
|
||||||
|
@ -2331,7 +2330,7 @@ void cmLocalVisualStudio7Generator::ReadAndStoreExternalGUID(
|
||||||
AddCacheEntry(guidStoreName.c_str(),
|
AddCacheEntry(guidStoreName.c_str(),
|
||||||
parser.GUID.c_str(),
|
parser.GUID.c_str(),
|
||||||
"Stored GUID",
|
"Stored GUID",
|
||||||
cmCacheManager::INTERNAL);
|
cmState::INTERNAL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,6 @@
|
||||||
#include "cmGlobalGenerator.h"
|
#include "cmGlobalGenerator.h"
|
||||||
#include "cmLocalGenerator.h"
|
#include "cmLocalGenerator.h"
|
||||||
#include "cmCommands.h"
|
#include "cmCommands.h"
|
||||||
#include "cmCacheManager.h"
|
|
||||||
#include "cmState.h"
|
#include "cmState.h"
|
||||||
#include "cmFunctionBlocker.h"
|
#include "cmFunctionBlocker.h"
|
||||||
#include "cmListFileCache.h"
|
#include "cmListFileCache.h"
|
||||||
|
@ -1806,7 +1805,7 @@ void cmMakefile::AddDefinition(const std::string& name, const char* value)
|
||||||
|
|
||||||
void cmMakefile::AddCacheDefinition(const std::string& name, const char* value,
|
void cmMakefile::AddCacheDefinition(const std::string& name, const char* value,
|
||||||
const char* doc,
|
const char* doc,
|
||||||
cmCacheManager::CacheEntryType type,
|
cmState::CacheEntryType type,
|
||||||
bool force)
|
bool force)
|
||||||
{
|
{
|
||||||
bool haveVal = value ? true : false;
|
bool haveVal = value ? true : false;
|
||||||
|
@ -1815,7 +1814,7 @@ void cmMakefile::AddCacheDefinition(const std::string& name, const char* value,
|
||||||
this->GetState()->GetInitializedCacheValue(name);
|
this->GetState()->GetInitializedCacheValue(name);
|
||||||
if(existingValue
|
if(existingValue
|
||||||
&& (this->GetState()->GetCacheEntryType(name)
|
&& (this->GetState()->GetCacheEntryType(name)
|
||||||
== cmCacheManager::UNINITIALIZED))
|
== cmState::UNINITIALIZED))
|
||||||
{
|
{
|
||||||
// if this is not a force, then use the value from the cache
|
// if this is not a force, then use the value from the cache
|
||||||
// if it is a force, then use the value being passed in
|
// if it is a force, then use the value being passed in
|
||||||
|
@ -1824,7 +1823,7 @@ void cmMakefile::AddCacheDefinition(const std::string& name, const char* value,
|
||||||
val = existingValue;
|
val = existingValue;
|
||||||
haveVal = true;
|
haveVal = true;
|
||||||
}
|
}
|
||||||
if ( type == cmCacheManager::PATH || type == cmCacheManager::FILEPATH )
|
if ( type == cmState::PATH || type == cmState::FILEPATH )
|
||||||
{
|
{
|
||||||
std::vector<std::string>::size_type cc;
|
std::vector<std::string>::size_type cc;
|
||||||
std::vector<std::string> files;
|
std::vector<std::string> files;
|
||||||
|
@ -3617,7 +3616,7 @@ int cmMakefile::TryCompile(const std::string& srcdir,
|
||||||
// Add this before the user-provided CMake arguments in case
|
// Add this before the user-provided CMake arguments in case
|
||||||
// one of the arguments is -DCMAKE_BUILD_TYPE=...
|
// one of the arguments is -DCMAKE_BUILD_TYPE=...
|
||||||
cm.AddCacheEntry("CMAKE_BUILD_TYPE", config,
|
cm.AddCacheEntry("CMAKE_BUILD_TYPE", config,
|
||||||
"Build configuration", cmCacheManager::STRING);
|
"Build configuration", cmState::STRING);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// if cmake args were provided then pass them in
|
// if cmake args were provided then pass them in
|
||||||
|
@ -3656,12 +3655,12 @@ int cmMakefile::TryCompile(const std::string& srcdir,
|
||||||
if(this->IsOn("CMAKE_SUPPRESS_DEVELOPER_WARNINGS"))
|
if(this->IsOn("CMAKE_SUPPRESS_DEVELOPER_WARNINGS"))
|
||||||
{
|
{
|
||||||
cm.AddCacheEntry("CMAKE_SUPPRESS_DEVELOPER_WARNINGS",
|
cm.AddCacheEntry("CMAKE_SUPPRESS_DEVELOPER_WARNINGS",
|
||||||
"TRUE", "", cmCacheManager::INTERNAL);
|
"TRUE", "", cmState::INTERNAL);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
cm.AddCacheEntry("CMAKE_SUPPRESS_DEVELOPER_WARNINGS",
|
cm.AddCacheEntry("CMAKE_SUPPRESS_DEVELOPER_WARNINGS",
|
||||||
"FALSE", "", cmCacheManager::INTERNAL);
|
"FALSE", "", cmState::INTERNAL);
|
||||||
}
|
}
|
||||||
if (cm.Configure() != 0)
|
if (cm.Configure() != 0)
|
||||||
{
|
{
|
||||||
|
@ -4914,7 +4913,7 @@ bool cmMakefile::SetPolicy(cmPolicies::PolicyID id,
|
||||||
"For backwards compatibility, what version of CMake "
|
"For backwards compatibility, what version of CMake "
|
||||||
"commands and "
|
"commands and "
|
||||||
"syntax should this version of CMake try to support.",
|
"syntax should this version of CMake try to support.",
|
||||||
cmCacheManager::STRING);
|
cmState::STRING);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -22,6 +22,7 @@
|
||||||
#include "cmGeneratorTarget.h"
|
#include "cmGeneratorTarget.h"
|
||||||
#include "cmExpandedCommandArgument.h"
|
#include "cmExpandedCommandArgument.h"
|
||||||
#include "cmake.h"
|
#include "cmake.h"
|
||||||
|
#include "cmState.h"
|
||||||
|
|
||||||
#if defined(CMAKE_BUILD_WITH_CMAKE)
|
#if defined(CMAKE_BUILD_WITH_CMAKE)
|
||||||
#include "cmSourceGroup.h"
|
#include "cmSourceGroup.h"
|
||||||
|
@ -305,7 +306,7 @@ public:
|
||||||
///! Add a definition to this makefile and the global cmake cache.
|
///! Add a definition to this makefile and the global cmake cache.
|
||||||
void AddCacheDefinition(const std::string& name, const char* value,
|
void AddCacheDefinition(const std::string& name, const char* value,
|
||||||
const char* doc,
|
const char* doc,
|
||||||
cmCacheManager::CacheEntryType type,
|
cmState::CacheEntryType type,
|
||||||
bool force = false);
|
bool force = false);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -39,7 +39,7 @@ bool cmMarkAsAdvancedCommand
|
||||||
cmState* state = this->Makefile->GetState();
|
cmState* state = this->Makefile->GetState();
|
||||||
if (!state->GetCacheEntryValue(variable))
|
if (!state->GetCacheEntryValue(variable))
|
||||||
{
|
{
|
||||||
state->AddCacheEntry(variable, 0, 0, cmCacheManager::UNINITIALIZED);
|
state->AddCacheEntry(variable, 0, 0, cmState::UNINITIALIZED);
|
||||||
overwrite = true;
|
overwrite = true;
|
||||||
}
|
}
|
||||||
if (!state->GetCacheEntryValue(variable))
|
if (!state->GetCacheEntryValue(variable))
|
||||||
|
|
|
@ -46,7 +46,7 @@ bool cmOptionCommand
|
||||||
const char* existingValue = state->GetCacheEntryValue(args[0]);
|
const char* existingValue = state->GetCacheEntryValue(args[0]);
|
||||||
if(existingValue)
|
if(existingValue)
|
||||||
{
|
{
|
||||||
if (state->GetCacheEntryType(args[0]) != cmCacheManager::UNINITIALIZED)
|
if (state->GetCacheEntryType(args[0]) != cmState::UNINITIALIZED)
|
||||||
{
|
{
|
||||||
state->SetCacheEntryProperty(args[0], "HELPSTRING", args[1]);
|
state->SetCacheEntryProperty(args[0], "HELPSTRING", args[1]);
|
||||||
return true;
|
return true;
|
||||||
|
@ -59,6 +59,6 @@ bool cmOptionCommand
|
||||||
}
|
}
|
||||||
bool init = cmSystemTools::IsOn(initialValue.c_str());
|
bool init = cmSystemTools::IsOn(initialValue.c_str());
|
||||||
this->Makefile->AddCacheDefinition(args[0], init? "ON":"OFF",
|
this->Makefile->AddCacheDefinition(args[0], init? "ON":"OFF",
|
||||||
args[1].c_str(), cmCacheManager::BOOL);
|
args[1].c_str(), cmState::BOOL);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,11 +30,11 @@ bool cmProjectCommand
|
||||||
this->Makefile->AddCacheDefinition
|
this->Makefile->AddCacheDefinition
|
||||||
(bindir,
|
(bindir,
|
||||||
this->Makefile->GetCurrentOutputDirectory(),
|
this->Makefile->GetCurrentOutputDirectory(),
|
||||||
"Value Computed by CMake", cmCacheManager::STATIC);
|
"Value Computed by CMake", cmState::STATIC);
|
||||||
this->Makefile->AddCacheDefinition
|
this->Makefile->AddCacheDefinition
|
||||||
(srcdir,
|
(srcdir,
|
||||||
this->Makefile->GetCurrentDirectory(),
|
this->Makefile->GetCurrentDirectory(),
|
||||||
"Value Computed by CMake", cmCacheManager::STATIC);
|
"Value Computed by CMake", cmState::STATIC);
|
||||||
|
|
||||||
bindir = "PROJECT_BINARY_DIR";
|
bindir = "PROJECT_BINARY_DIR";
|
||||||
srcdir = "PROJECT_SOURCE_DIR";
|
srcdir = "PROJECT_SOURCE_DIR";
|
||||||
|
@ -59,7 +59,7 @@ bool cmProjectCommand
|
||||||
this->Makefile->AddCacheDefinition
|
this->Makefile->AddCacheDefinition
|
||||||
("CMAKE_PROJECT_NAME",
|
("CMAKE_PROJECT_NAME",
|
||||||
args[0].c_str(),
|
args[0].c_str(),
|
||||||
"Value Computed by CMake", cmCacheManager::STATIC);
|
"Value Computed by CMake", cmState::STATIC);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool haveVersion = false;
|
bool haveVersion = false;
|
||||||
|
|
|
@ -79,8 +79,8 @@ bool cmSetCommand
|
||||||
bool cache = false; // optional
|
bool cache = false; // optional
|
||||||
bool force = false; // optional
|
bool force = false; // optional
|
||||||
bool parentScope = false;
|
bool parentScope = false;
|
||||||
cmCacheManager::CacheEntryType type
|
cmState::CacheEntryType type
|
||||||
= cmCacheManager::STRING; // required if cache
|
= cmState::STRING; // required if cache
|
||||||
const char* docstring = 0; // required if cache
|
const char* docstring = 0; // required if cache
|
||||||
|
|
||||||
unsigned int ignoreLastArgs = 0;
|
unsigned int ignoreLastArgs = 0;
|
||||||
|
@ -131,7 +131,7 @@ bool cmSetCommand
|
||||||
if(cache)
|
if(cache)
|
||||||
{
|
{
|
||||||
std::string::size_type cacheStart = args.size() - 3 - (force ? 1 : 0);
|
std::string::size_type cacheStart = args.size() - 3 - (force ? 1 : 0);
|
||||||
type = cmCacheManager::StringToType(args[cacheStart+1].c_str());
|
type = cmState::StringToCacheEntryType(args[cacheStart+1].c_str());
|
||||||
docstring = args[cacheStart+2].c_str();
|
docstring = args[cacheStart+2].c_str();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -139,13 +139,13 @@ bool cmSetCommand
|
||||||
cmState* state = this->Makefile->GetState();
|
cmState* state = this->Makefile->GetState();
|
||||||
const char* existingValue = state->GetCacheEntryValue(variable);
|
const char* existingValue = state->GetCacheEntryValue(variable);
|
||||||
if(existingValue &&
|
if(existingValue &&
|
||||||
(state->GetCacheEntryType(variable) != cmCacheManager::UNINITIALIZED))
|
(state->GetCacheEntryType(variable) != cmState::UNINITIALIZED))
|
||||||
{
|
{
|
||||||
// if the set is trying to CACHE the value but the value
|
// if the set is trying to CACHE the value but the value
|
||||||
// is already in the cache and the type is not internal
|
// is already in the cache and the type is not internal
|
||||||
// then leave now without setting any definitions in the cache
|
// then leave now without setting any definitions in the cache
|
||||||
// or the makefile
|
// or the makefile
|
||||||
if(cache && type != cmCacheManager::INTERNAL && !force)
|
if(cache && type != cmState::INTERNAL && !force)
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
#include "cmSetTestsPropertiesCommand.h"
|
#include "cmSetTestsPropertiesCommand.h"
|
||||||
#include "cmSetSourceFilesPropertiesCommand.h"
|
#include "cmSetSourceFilesPropertiesCommand.h"
|
||||||
|
|
||||||
#include "cmCacheManager.h"
|
|
||||||
|
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
cmSetPropertyCommand::cmSetPropertyCommand()
|
cmSetPropertyCommand::cmSetPropertyCommand()
|
||||||
|
@ -426,7 +425,7 @@ bool cmSetPropertyCommand::HandleCacheMode()
|
||||||
}
|
}
|
||||||
else if(this->PropertyName == "TYPE")
|
else if(this->PropertyName == "TYPE")
|
||||||
{
|
{
|
||||||
if(!cmCacheManager::IsType(this->PropertyValue.c_str()))
|
if(!cmState::IsCacheEntryType(this->PropertyValue.c_str()))
|
||||||
{
|
{
|
||||||
std::ostringstream e;
|
std::ostringstream e;
|
||||||
e << "given invalid CACHE entry TYPE \"" << this->PropertyValue << "\"";
|
e << "given invalid CACHE entry TYPE \"" << this->PropertyValue << "\"";
|
||||||
|
|
|
@ -88,7 +88,7 @@ bool cmSiteNameCommand
|
||||||
AddCacheDefinition(args[0],
|
AddCacheDefinition(args[0],
|
||||||
siteName.c_str(),
|
siteName.c_str(),
|
||||||
"Name of the computer/site where compile is being run",
|
"Name of the computer/site where compile is being run",
|
||||||
cmCacheManager::STRING);
|
cmState::STRING);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,26 +12,59 @@
|
||||||
#include "cmState.h"
|
#include "cmState.h"
|
||||||
|
|
||||||
#include "cmake.h"
|
#include "cmake.h"
|
||||||
|
#include "cmCacheManager.h"
|
||||||
|
|
||||||
cmState::cmState(cmake* cm)
|
cmState::cmState(cmake* cm)
|
||||||
: CMakeInstance(cm)
|
: CMakeInstance(cm)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
cmCacheManager::CacheEntryType
|
|
||||||
cmState::StringToCacheEntryType(const char* s)
|
const char* cmCacheEntryTypes[] =
|
||||||
{
|
{ "BOOL",
|
||||||
return cmCacheManager::StringToType(s);
|
"PATH",
|
||||||
}
|
"FILEPATH",
|
||||||
|
"STRING",
|
||||||
|
"INTERNAL",
|
||||||
|
"STATIC",
|
||||||
|
"UNINITIALIZED",
|
||||||
|
0
|
||||||
|
};
|
||||||
|
|
||||||
const char*
|
const char*
|
||||||
cmState::CacheEntryTypeToString(cmCacheManager::CacheEntryType t)
|
cmState::CacheEntryTypeToString(cmState::CacheEntryType type)
|
||||||
{
|
{
|
||||||
return cmCacheManager::TypeToString(t);
|
if ( type > 6 )
|
||||||
|
{
|
||||||
|
return cmCacheEntryTypes[6];
|
||||||
|
}
|
||||||
|
return cmCacheEntryTypes[type];
|
||||||
|
}
|
||||||
|
|
||||||
|
cmState::CacheEntryType
|
||||||
|
cmState::StringToCacheEntryType(const char* s)
|
||||||
|
{
|
||||||
|
int i = 0;
|
||||||
|
while(cmCacheEntryTypes[i])
|
||||||
|
{
|
||||||
|
if(strcmp(s, cmCacheEntryTypes[i]) == 0)
|
||||||
|
{
|
||||||
|
return static_cast<cmState::CacheEntryType>(i);
|
||||||
|
}
|
||||||
|
++i;
|
||||||
|
}
|
||||||
|
return STRING;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool cmState::IsCacheEntryType(std::string const& key)
|
bool cmState::IsCacheEntryType(std::string const& key)
|
||||||
{
|
{
|
||||||
return cmCacheManager::IsType(key.c_str());
|
for(int i=0; cmCacheEntryTypes[i]; ++i)
|
||||||
|
{
|
||||||
|
if(strcmp(key.c_str(), cmCacheEntryTypes[i]) == 0)
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::vector<std::string> cmState::GetCacheEntryKeys() const
|
std::vector<std::string> cmState::GetCacheEntryKeys() const
|
||||||
|
@ -64,7 +97,7 @@ cmState::GetInitializedCacheValue(std::string const& key) const
|
||||||
return this->CMakeInstance->GetCacheManager()->GetInitializedCacheValue(key);
|
return this->CMakeInstance->GetCacheManager()->GetInitializedCacheValue(key);
|
||||||
}
|
}
|
||||||
|
|
||||||
cmCacheManager::CacheEntryType
|
cmState::CacheEntryType
|
||||||
cmState::GetCacheEntryType(std::string const& key) const
|
cmState::GetCacheEntryType(std::string const& key) const
|
||||||
{
|
{
|
||||||
cmCacheManager::CacheIterator it =
|
cmCacheManager::CacheIterator it =
|
||||||
|
@ -117,7 +150,7 @@ bool cmState::GetCacheEntryPropertyAsBool(std::string const& key,
|
||||||
|
|
||||||
void cmState::AddCacheEntry(const std::string& key, const char* value,
|
void cmState::AddCacheEntry(const std::string& key, const char* value,
|
||||||
const char* helpString,
|
const char* helpString,
|
||||||
cmCacheManager::CacheEntryType type)
|
cmState::CacheEntryType type)
|
||||||
{
|
{
|
||||||
this->CMakeInstance->GetCacheManager()->AddCacheEntry(key, value,
|
this->CMakeInstance->GetCacheManager()->AddCacheEntry(key, value,
|
||||||
helpString, type);
|
helpString, type);
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
#ifndef cmState_h
|
#ifndef cmState_h
|
||||||
#define cmState_h
|
#define cmState_h
|
||||||
|
|
||||||
#include "cmCacheManager.h"
|
#include "cmStandardIncludes.h"
|
||||||
|
|
||||||
class cmake;
|
class cmake;
|
||||||
|
|
||||||
|
@ -21,21 +21,21 @@ class cmState
|
||||||
public:
|
public:
|
||||||
cmState(cmake* cm);
|
cmState(cmake* cm);
|
||||||
|
|
||||||
static cmCacheManager::CacheEntryType StringToCacheEntryType(const char*);
|
enum CacheEntryType{ BOOL=0, PATH, FILEPATH, STRING, INTERNAL,STATIC,
|
||||||
static const char* CacheEntryTypeToString(cmCacheManager::CacheEntryType);
|
UNINITIALIZED };
|
||||||
|
static CacheEntryType StringToCacheEntryType(const char*);
|
||||||
|
static const char* CacheEntryTypeToString(CacheEntryType);
|
||||||
static bool IsCacheEntryType(std::string const& key);
|
static bool IsCacheEntryType(std::string const& key);
|
||||||
|
|
||||||
std::vector<std::string> GetCacheEntryKeys() const;
|
std::vector<std::string> GetCacheEntryKeys() const;
|
||||||
const char* GetCacheEntryValue(std::string const& key) const;
|
const char* GetCacheEntryValue(std::string const& key) const;
|
||||||
const char* GetInitializedCacheValue(std::string const& key) const;
|
const char* GetInitializedCacheValue(std::string const& key) const;
|
||||||
cmCacheManager::CacheEntryType
|
CacheEntryType GetCacheEntryType(std::string const& key) const;
|
||||||
GetCacheEntryType(std::string const& key) const;
|
|
||||||
void SetCacheEntryValue(std::string const& key, std::string const& value);
|
void SetCacheEntryValue(std::string const& key, std::string const& value);
|
||||||
void SetCacheValue(std::string const& key, std::string const& value);
|
void SetCacheValue(std::string const& key, std::string const& value);
|
||||||
|
|
||||||
void AddCacheEntry(const std::string& key, const char* value,
|
void AddCacheEntry(const std::string& key, const char* value,
|
||||||
const char* helpString,
|
const char* helpString, CacheEntryType type);
|
||||||
cmCacheManager::CacheEntryType type);
|
|
||||||
void RemoveCacheEntry(std::string const& key);
|
void RemoveCacheEntry(std::string const& key);
|
||||||
|
|
||||||
void SetCacheEntryProperty(std::string const& key,
|
void SetCacheEntryProperty(std::string const& key,
|
||||||
|
|
|
@ -1181,7 +1181,7 @@ void cmTarget::ClearDependencyInformation( cmMakefile& mf,
|
||||||
if (this->RecordDependencies)
|
if (this->RecordDependencies)
|
||||||
{
|
{
|
||||||
mf.AddCacheDefinition(depname, "",
|
mf.AddCacheDefinition(depname, "",
|
||||||
"Dependencies for target", cmCacheManager::STATIC);
|
"Dependencies for target", cmState::STATIC);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -1369,7 +1369,7 @@ void cmTarget::AddLinkLibrary(cmMakefile& mf,
|
||||||
dependencies += ";";
|
dependencies += ";";
|
||||||
mf.AddCacheDefinition( targetEntry, dependencies.c_str(),
|
mf.AddCacheDefinition( targetEntry, dependencies.c_str(),
|
||||||
"Dependencies for the target",
|
"Dependencies for the target",
|
||||||
cmCacheManager::STATIC );
|
cmState::STATIC );
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,7 +10,6 @@
|
||||||
See the License for more information.
|
See the License for more information.
|
||||||
============================================================================*/
|
============================================================================*/
|
||||||
#include "cmTryRunCommand.h"
|
#include "cmTryRunCommand.h"
|
||||||
#include "cmCacheManager.h"
|
|
||||||
#include "cmTryCompileCommand.h"
|
#include "cmTryCompileCommand.h"
|
||||||
#include <cmsys/FStream.hxx>
|
#include <cmsys/FStream.hxx>
|
||||||
|
|
||||||
|
@ -217,7 +216,7 @@ void cmTryRunCommand::RunExecutable(const std::string& runArgs,
|
||||||
}
|
}
|
||||||
this->Makefile->AddCacheDefinition(this->RunResultVariable, retChar,
|
this->Makefile->AddCacheDefinition(this->RunResultVariable, retChar,
|
||||||
"Result of TRY_RUN",
|
"Result of TRY_RUN",
|
||||||
cmCacheManager::INTERNAL);
|
cmState::INTERNAL);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* This is only used when cross compiling. Instead of running the
|
/* This is only used when cross compiling. Instead of running the
|
||||||
|
@ -262,7 +261,7 @@ void cmTryRunCommand::DoNotRunExecutable(const std::string& runArgs,
|
||||||
this->Makefile->AddCacheDefinition(this->RunResultVariable,
|
this->Makefile->AddCacheDefinition(this->RunResultVariable,
|
||||||
"PLEASE_FILL_OUT-FAILED_TO_RUN",
|
"PLEASE_FILL_OUT-FAILED_TO_RUN",
|
||||||
comment.c_str(),
|
comment.c_str(),
|
||||||
cmCacheManager::STRING);
|
cmState::STRING);
|
||||||
|
|
||||||
cmState* state = this->Makefile->GetState();
|
cmState* state = this->Makefile->GetState();
|
||||||
const char* existingValue
|
const char* existingValue
|
||||||
|
@ -290,7 +289,7 @@ void cmTryRunCommand::DoNotRunExecutable(const std::string& runArgs,
|
||||||
this->Makefile->AddCacheDefinition(internalRunOutputName,
|
this->Makefile->AddCacheDefinition(internalRunOutputName,
|
||||||
"PLEASE_FILL_OUT-NOTFOUND",
|
"PLEASE_FILL_OUT-NOTFOUND",
|
||||||
comment.c_str(),
|
comment.c_str(),
|
||||||
cmCacheManager::STRING);
|
cmState::STRING);
|
||||||
cmState* state = this->Makefile->GetState();
|
cmState* state = this->Makefile->GetState();
|
||||||
const char* existing =
|
const char* existing =
|
||||||
state->GetCacheEntryValue(internalRunOutputName);
|
state->GetCacheEntryValue(internalRunOutputName);
|
||||||
|
|
|
@ -11,6 +11,8 @@
|
||||||
============================================================================*/
|
============================================================================*/
|
||||||
#include "cmUtilitySourceCommand.h"
|
#include "cmUtilitySourceCommand.h"
|
||||||
|
|
||||||
|
#include "cmCacheManager.h"
|
||||||
|
|
||||||
// cmUtilitySourceCommand
|
// cmUtilitySourceCommand
|
||||||
bool cmUtilitySourceCommand
|
bool cmUtilitySourceCommand
|
||||||
::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
|
::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
|
||||||
|
@ -118,14 +120,14 @@ bool cmUtilitySourceCommand
|
||||||
this->Makefile->AddCacheDefinition(cacheEntry,
|
this->Makefile->AddCacheDefinition(cacheEntry,
|
||||||
utilityExecutable.c_str(),
|
utilityExecutable.c_str(),
|
||||||
"Path to an internal program.",
|
"Path to an internal program.",
|
||||||
cmCacheManager::FILEPATH);
|
cmState::FILEPATH);
|
||||||
// add a value into the cache that maps from the
|
// add a value into the cache that maps from the
|
||||||
// full path to the name of the project
|
// full path to the name of the project
|
||||||
cmSystemTools::ConvertToUnixSlashes(utilityExecutable);
|
cmSystemTools::ConvertToUnixSlashes(utilityExecutable);
|
||||||
this->Makefile->AddCacheDefinition(utilityExecutable,
|
this->Makefile->AddCacheDefinition(utilityExecutable,
|
||||||
utilityName.c_str(),
|
utilityName.c_str(),
|
||||||
"Executable to project name.",
|
"Executable to project name.",
|
||||||
cmCacheManager::INTERNAL);
|
cmState::INTERNAL);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -338,7 +338,7 @@ bool cmake::SetCacheArgs(const std::vector<std::string>& args)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
std::string var, value;
|
std::string var, value;
|
||||||
cmCacheManager::CacheEntryType type = cmCacheManager::UNINITIALIZED;
|
cmState::CacheEntryType type = cmState::UNINITIALIZED;
|
||||||
if(cmCacheManager::ParseEntry(entry, var, value, type))
|
if(cmCacheManager::ParseEntry(entry, var, value, type))
|
||||||
{
|
{
|
||||||
// The value is transformed if it is a filepath for example, so
|
// The value is transformed if it is a filepath for example, so
|
||||||
|
@ -409,8 +409,8 @@ bool cmake::SetCacheArgs(const std::vector<std::string>& args)
|
||||||
for (std::vector<std::string>::const_iterator it = cacheKeys.begin();
|
for (std::vector<std::string>::const_iterator it = cacheKeys.begin();
|
||||||
it != cacheKeys.end(); ++it)
|
it != cacheKeys.end(); ++it)
|
||||||
{
|
{
|
||||||
cmCacheManager::CacheEntryType t = this->State->GetCacheEntryType(*it);
|
cmState::CacheEntryType t = this->State->GetCacheEntryType(*it);
|
||||||
if(t != cmCacheManager::STATIC)
|
if(t != cmState::STATIC)
|
||||||
{
|
{
|
||||||
if (regex.find(it->c_str()))
|
if (regex.find(it->c_str()))
|
||||||
{
|
{
|
||||||
|
@ -975,14 +975,14 @@ int cmake::AddCMakePaths()
|
||||||
// Save the value in the cache
|
// Save the value in the cache
|
||||||
this->CacheManager->AddCacheEntry
|
this->CacheManager->AddCacheEntry
|
||||||
("CMAKE_COMMAND", cmSystemTools::GetCMakeCommand().c_str(),
|
("CMAKE_COMMAND", cmSystemTools::GetCMakeCommand().c_str(),
|
||||||
"Path to CMake executable.", cmCacheManager::INTERNAL);
|
"Path to CMake executable.", cmState::INTERNAL);
|
||||||
#ifdef CMAKE_BUILD_WITH_CMAKE
|
#ifdef CMAKE_BUILD_WITH_CMAKE
|
||||||
this->CacheManager->AddCacheEntry
|
this->CacheManager->AddCacheEntry
|
||||||
("CMAKE_CTEST_COMMAND", cmSystemTools::GetCTestCommand().c_str(),
|
("CMAKE_CTEST_COMMAND", cmSystemTools::GetCTestCommand().c_str(),
|
||||||
"Path to ctest program executable.", cmCacheManager::INTERNAL);
|
"Path to ctest program executable.", cmState::INTERNAL);
|
||||||
this->CacheManager->AddCacheEntry
|
this->CacheManager->AddCacheEntry
|
||||||
("CMAKE_CPACK_COMMAND", cmSystemTools::GetCPackCommand().c_str(),
|
("CMAKE_CPACK_COMMAND", cmSystemTools::GetCPackCommand().c_str(),
|
||||||
"Path to cpack program executable.", cmCacheManager::INTERNAL);
|
"Path to cpack program executable.", cmState::INTERNAL);
|
||||||
#endif
|
#endif
|
||||||
if(!cmSystemTools::FileExists(
|
if(!cmSystemTools::FileExists(
|
||||||
(cmSystemTools::GetCMakeRoot()+"/Modules/CMake.cmake").c_str()))
|
(cmSystemTools::GetCMakeRoot()+"/Modules/CMake.cmake").c_str()))
|
||||||
|
@ -996,7 +996,7 @@ int cmake::AddCMakePaths()
|
||||||
}
|
}
|
||||||
this->CacheManager->AddCacheEntry
|
this->CacheManager->AddCacheEntry
|
||||||
("CMAKE_ROOT", cmSystemTools::GetCMakeRoot().c_str(),
|
("CMAKE_ROOT", cmSystemTools::GetCMakeRoot().c_str(),
|
||||||
"Path to CMake installation.", cmCacheManager::INTERNAL);
|
"Path to CMake installation.", cmState::INTERNAL);
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
@ -1238,7 +1238,7 @@ struct SaveCacheEntry
|
||||||
std::string key;
|
std::string key;
|
||||||
std::string value;
|
std::string value;
|
||||||
std::string help;
|
std::string help;
|
||||||
cmCacheManager::CacheEntryType type;
|
cmState::CacheEntryType type;
|
||||||
};
|
};
|
||||||
|
|
||||||
int cmake::HandleDeleteCacheVariables(const std::string& var)
|
int cmake::HandleDeleteCacheVariables(const std::string& var)
|
||||||
|
@ -1311,7 +1311,7 @@ int cmake::Configure()
|
||||||
AddCacheEntry("CMAKE_SUPPRESS_DEVELOPER_WARNINGS", "TRUE",
|
AddCacheEntry("CMAKE_SUPPRESS_DEVELOPER_WARNINGS", "TRUE",
|
||||||
"Suppress Warnings that are meant for"
|
"Suppress Warnings that are meant for"
|
||||||
" the author of the CMakeLists.txt files.",
|
" the author of the CMakeLists.txt files.",
|
||||||
cmCacheManager::INTERNAL);
|
cmState::INTERNAL);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -1319,7 +1319,7 @@ int cmake::Configure()
|
||||||
AddCacheEntry("CMAKE_SUPPRESS_DEVELOPER_WARNINGS", "FALSE",
|
AddCacheEntry("CMAKE_SUPPRESS_DEVELOPER_WARNINGS", "FALSE",
|
||||||
"Suppress Warnings that are meant for"
|
"Suppress Warnings that are meant for"
|
||||||
" the author of the CMakeLists.txt files.",
|
" the author of the CMakeLists.txt files.",
|
||||||
cmCacheManager::INTERNAL);
|
cmState::INTERNAL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
int ret = this->ActualConfigure();
|
int ret = this->ActualConfigure();
|
||||||
|
@ -1355,7 +1355,7 @@ int cmake::ActualConfigure()
|
||||||
this->GetHomeDirectory(),
|
this->GetHomeDirectory(),
|
||||||
"Start directory with the top level CMakeLists.txt file for this "
|
"Start directory with the top level CMakeLists.txt file for this "
|
||||||
"project",
|
"project",
|
||||||
cmCacheManager::INTERNAL);
|
cmState::INTERNAL);
|
||||||
}
|
}
|
||||||
|
|
||||||
// no generator specified on the command line
|
// no generator specified on the command line
|
||||||
|
@ -1464,11 +1464,11 @@ int cmake::ActualConfigure()
|
||||||
this->CacheManager->AddCacheEntry("CMAKE_GENERATOR",
|
this->CacheManager->AddCacheEntry("CMAKE_GENERATOR",
|
||||||
this->GlobalGenerator->GetName().c_str(),
|
this->GlobalGenerator->GetName().c_str(),
|
||||||
"Name of generator.",
|
"Name of generator.",
|
||||||
cmCacheManager::INTERNAL);
|
cmState::INTERNAL);
|
||||||
this->CacheManager->AddCacheEntry("CMAKE_EXTRA_GENERATOR",
|
this->CacheManager->AddCacheEntry("CMAKE_EXTRA_GENERATOR",
|
||||||
this->GlobalGenerator->GetExtraGeneratorName().c_str(),
|
this->GlobalGenerator->GetExtraGeneratorName().c_str(),
|
||||||
"Name of external makefile project generator.",
|
"Name of external makefile project generator.",
|
||||||
cmCacheManager::INTERNAL);
|
cmState::INTERNAL);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(const char* platformName =
|
if(const char* platformName =
|
||||||
|
@ -1496,7 +1496,7 @@ int cmake::ActualConfigure()
|
||||||
this->CacheManager->AddCacheEntry("CMAKE_GENERATOR_PLATFORM",
|
this->CacheManager->AddCacheEntry("CMAKE_GENERATOR_PLATFORM",
|
||||||
this->GeneratorPlatform.c_str(),
|
this->GeneratorPlatform.c_str(),
|
||||||
"Name of generator platform.",
|
"Name of generator platform.",
|
||||||
cmCacheManager::INTERNAL);
|
cmState::INTERNAL);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(const char* tsName =
|
if(const char* tsName =
|
||||||
|
@ -1524,7 +1524,7 @@ int cmake::ActualConfigure()
|
||||||
this->CacheManager->AddCacheEntry("CMAKE_GENERATOR_TOOLSET",
|
this->CacheManager->AddCacheEntry("CMAKE_GENERATOR_TOOLSET",
|
||||||
this->GeneratorToolset.c_str(),
|
this->GeneratorToolset.c_str(),
|
||||||
"Name of generator toolset.",
|
"Name of generator toolset.",
|
||||||
cmCacheManager::INTERNAL);
|
cmState::INTERNAL);
|
||||||
}
|
}
|
||||||
|
|
||||||
// reset any system configuration information, except for when we are
|
// reset any system configuration information, except for when we are
|
||||||
|
@ -1562,7 +1562,7 @@ int cmake::ActualConfigure()
|
||||||
this->State->AddCacheEntry
|
this->State->AddCacheEntry
|
||||||
("LIBRARY_OUTPUT_PATH", "",
|
("LIBRARY_OUTPUT_PATH", "",
|
||||||
"Single output directory for building all libraries.",
|
"Single output directory for building all libraries.",
|
||||||
cmCacheManager::PATH);
|
cmState::PATH);
|
||||||
}
|
}
|
||||||
if(!this->State
|
if(!this->State
|
||||||
->GetInitializedCacheValue("EXECUTABLE_OUTPUT_PATH"))
|
->GetInitializedCacheValue("EXECUTABLE_OUTPUT_PATH"))
|
||||||
|
@ -1570,7 +1570,7 @@ int cmake::ActualConfigure()
|
||||||
this->State->AddCacheEntry
|
this->State->AddCacheEntry
|
||||||
("EXECUTABLE_OUTPUT_PATH", "",
|
("EXECUTABLE_OUTPUT_PATH", "",
|
||||||
"Single output directory for building all executables.",
|
"Single output directory for building all executables.",
|
||||||
cmCacheManager::PATH);
|
cmState::PATH);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(!this->State
|
if(!this->State
|
||||||
|
@ -1579,7 +1579,7 @@ int cmake::ActualConfigure()
|
||||||
this->State->AddCacheEntry
|
this->State->AddCacheEntry
|
||||||
("CMAKE_USE_RELATIVE_PATHS", "OFF",
|
("CMAKE_USE_RELATIVE_PATHS", "OFF",
|
||||||
"If true, cmake will use relative paths in makefiles and projects.",
|
"If true, cmake will use relative paths in makefiles and projects.",
|
||||||
cmCacheManager::BOOL);
|
cmState::BOOL);
|
||||||
if (!this->State->GetCacheEntryProperty("CMAKE_USE_RELATIVE_PATHS",
|
if (!this->State->GetCacheEntryProperty("CMAKE_USE_RELATIVE_PATHS",
|
||||||
"ADVANCED"))
|
"ADVANCED"))
|
||||||
{
|
{
|
||||||
|
@ -1804,7 +1804,7 @@ void cmake::AddCacheEntry(const std::string& key, const char* value,
|
||||||
{
|
{
|
||||||
this->CacheManager->AddCacheEntry(key, value,
|
this->CacheManager->AddCacheEntry(key, value,
|
||||||
helpString,
|
helpString,
|
||||||
cmCacheManager::CacheEntryType(type));
|
cmState::CacheEntryType(type));
|
||||||
}
|
}
|
||||||
|
|
||||||
const char* cmake::GetCacheDefinition(const std::string& name) const
|
const char* cmake::GetCacheDefinition(const std::string& name) const
|
||||||
|
@ -1876,7 +1876,7 @@ void cmake::AddDefaultGenerators()
|
||||||
bool cmake::ParseCacheEntry(const std::string& entry,
|
bool cmake::ParseCacheEntry(const std::string& entry,
|
||||||
std::string& var,
|
std::string& var,
|
||||||
std::string& value,
|
std::string& value,
|
||||||
cmCacheManager::CacheEntryType& type)
|
cmState::CacheEntryType& type)
|
||||||
{
|
{
|
||||||
return cmCacheManager::ParseEntry(entry, var, value, type);
|
return cmCacheManager::ParseEntry(entry, var, value, type);
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,6 +19,7 @@
|
||||||
#include "cmPropertyMap.h"
|
#include "cmPropertyMap.h"
|
||||||
#include "cmInstalledFile.h"
|
#include "cmInstalledFile.h"
|
||||||
#include "cmCacheManager.h"
|
#include "cmCacheManager.h"
|
||||||
|
#include "cmState.h"
|
||||||
|
|
||||||
class cmGlobalGeneratorFactory;
|
class cmGlobalGeneratorFactory;
|
||||||
class cmGlobalGenerator;
|
class cmGlobalGenerator;
|
||||||
|
@ -178,7 +179,7 @@ class cmake
|
||||||
static bool ParseCacheEntry(const std::string& entry,
|
static bool ParseCacheEntry(const std::string& entry,
|
||||||
std::string& var,
|
std::string& var,
|
||||||
std::string& value,
|
std::string& value,
|
||||||
cmCacheManager::CacheEntryType& type);
|
cmState::CacheEntryType& type);
|
||||||
|
|
||||||
int LoadCache();
|
int LoadCache();
|
||||||
bool LoadCache(const std::string& path);
|
bool LoadCache(const std::string& path);
|
||||||
|
|
|
@ -19,7 +19,6 @@
|
||||||
#include "cmake.h"
|
#include "cmake.h"
|
||||||
#include "cmcmd.h"
|
#include "cmcmd.h"
|
||||||
#include "cmState.h"
|
#include "cmState.h"
|
||||||
#include "cmCacheManager.h"
|
|
||||||
#include "cmListFileCache.h"
|
#include "cmListFileCache.h"
|
||||||
#include "cmSourceFile.h"
|
#include "cmSourceFile.h"
|
||||||
#include "cmGlobalGenerator.h"
|
#include "cmGlobalGenerator.h"
|
||||||
|
@ -330,15 +329,13 @@ int do_cmake(int ac, char const* const* av)
|
||||||
if ( list_cached || list_all_cached )
|
if ( list_cached || list_all_cached )
|
||||||
{
|
{
|
||||||
std::cout << "-- Cache values" << std::endl;
|
std::cout << "-- Cache values" << std::endl;
|
||||||
std::vector<std::string> keys =
|
std::vector<std::string> keys = cm.GetState()->GetCacheEntryKeys();
|
||||||
cm.GetState()->GetCacheEntryKeys();
|
|
||||||
for (std::vector<std::string>::const_iterator it = keys.begin();
|
for (std::vector<std::string>::const_iterator it = keys.begin();
|
||||||
it != keys.end(); ++it)
|
it != keys.end(); ++it)
|
||||||
{
|
{
|
||||||
cmCacheManager::CacheEntryType t =
|
cmState::CacheEntryType t = cm.GetState()->GetCacheEntryType(*it);
|
||||||
cm.GetState()->GetCacheEntryType(*it);
|
if (t != cmState::INTERNAL && t != cmState::STATIC &&
|
||||||
if ( t != cmCacheManager::INTERNAL && t != cmCacheManager::STATIC &&
|
t != cmState::UNINITIALIZED)
|
||||||
t != cmCacheManager::UNINITIALIZED )
|
|
||||||
{
|
{
|
||||||
const char* advancedProp =
|
const char* advancedProp =
|
||||||
cm.GetState()->GetCacheEntryProperty(*it, "ADVANCED");
|
cm.GetState()->GetCacheEntryProperty(*it, "ADVANCED");
|
||||||
|
@ -351,7 +348,7 @@ int do_cmake(int ac, char const* const* av)
|
||||||
"HELPSTRING") << std::endl;
|
"HELPSTRING") << std::endl;
|
||||||
}
|
}
|
||||||
std::cout << *it << ":" <<
|
std::cout << *it << ":" <<
|
||||||
cmCacheManager::TypeToString(t)
|
cmState::CacheEntryTypeToString(t)
|
||||||
<< "=" << cm.GetState()->GetCacheEntryValue(*it)
|
<< "=" << cm.GetState()->GetCacheEntryValue(*it)
|
||||||
<< std::endl;
|
<< std::endl;
|
||||||
if ( list_help )
|
if ( list_help )
|
||||||
|
|
Loading…
Reference in New Issue