ENH: clean up warnings
This commit is contained in:
parent
f3ebd438c7
commit
41017cbc88
|
@ -88,7 +88,8 @@ void CMakeSetupGUI::cb_m_OKButton(Fl_Button* o, void* v) {
|
||||||
}
|
}
|
||||||
|
|
||||||
CMakeSetupGUI::CMakeSetupGUI() {
|
CMakeSetupGUI::CMakeSetupGUI() {
|
||||||
{ Fl_Window* o = dialogWindow = new Fl_Window(562, 373, "CMakeSetupDialog");
|
{ Fl_Window* w;
|
||||||
|
Fl_Window* o = dialogWindow = new Fl_Window(562, 373, "CMakeSetupDialog");
|
||||||
w = o;
|
w = o;
|
||||||
o->callback((Fl_Callback*)cb_dialogWindow, (void*)(this));
|
o->callback((Fl_Callback*)cb_dialogWindow, (void*)(this));
|
||||||
{ Fl_Input* o = sourcePathTextInput = new Fl_Input(219, 15, 200, 20, "Where is the source code: ");
|
{ Fl_Input* o = sourcePathTextInput = new Fl_Input(219, 15, 200, 20, "Where is the source code: ");
|
||||||
|
|
|
@ -67,7 +67,7 @@ private:
|
||||||
inline void cb_m_OKButton_i(Fl_Button*, void*);
|
inline void cb_m_OKButton_i(Fl_Button*, void*);
|
||||||
static void cb_m_OKButton(Fl_Button*, void*);
|
static void cb_m_OKButton(Fl_Button*, void*);
|
||||||
public:
|
public:
|
||||||
~CMakeSetupGUI();
|
virtual ~CMakeSetupGUI();
|
||||||
virtual void Close(void);
|
virtual void Close(void);
|
||||||
virtual void BrowseForSourcePath(void);
|
virtual void BrowseForSourcePath(void);
|
||||||
virtual void BrowseForBinaryPath(void);
|
virtual void BrowseForBinaryPath(void);
|
||||||
|
|
|
@ -518,6 +518,7 @@ CMakeSetupGUIImplementation
|
||||||
reverseOrder);
|
reverseOrder);
|
||||||
break;
|
break;
|
||||||
case cmCacheManager::INTERNAL:
|
case cmCacheManager::INTERNAL:
|
||||||
|
case cmCacheManager::STATIC:
|
||||||
// These entries should not be seen by the user
|
// These entries should not be seen by the user
|
||||||
m_CacheEntriesList.RemoveProperty(key);
|
m_CacheEntriesList.RemoveProperty(key);
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -139,7 +139,6 @@ bool cmCacheManager::LoadCache(const char* path,
|
||||||
// input line is: "key":type=value
|
// input line is: "key":type=value
|
||||||
cmRegularExpression regQuoted("^\"([^\"]*)\":([^=]*)=(.*[^\t ]|[\t ]*)[\t ]*$");
|
cmRegularExpression regQuoted("^\"([^\"]*)\":([^=]*)=(.*[^\t ]|[\t ]*)[\t ]*$");
|
||||||
|
|
||||||
std::set<std::string>::const_iterator iter;
|
|
||||||
std::string entryKey;
|
std::string entryKey;
|
||||||
while(fin)
|
while(fin)
|
||||||
{
|
{
|
||||||
|
|
|
@ -58,7 +58,7 @@ IsFunctionBlocked(const char *name, const std::vector<std::string> &args,
|
||||||
for( ; j != m_Args.end(); ++j)
|
for( ; j != m_Args.end(); ++j)
|
||||||
{
|
{
|
||||||
// perform string replace
|
// perform string replace
|
||||||
for(int c = 0; c < m_Commands.size(); ++c)
|
for(unsigned int c = 0; c < m_Commands.size(); ++c)
|
||||||
{
|
{
|
||||||
std::vector<std::string> newArgs;
|
std::vector<std::string> newArgs;
|
||||||
for (std::vector<std::string>::const_iterator k =
|
for (std::vector<std::string>::const_iterator k =
|
||||||
|
|
|
@ -21,7 +21,7 @@ bool cmIncludeExternalMSProjectCommand::InitialPass(std::vector<std::string> con
|
||||||
|
|
||||||
std::vector<std::string> depends;
|
std::vector<std::string> depends;
|
||||||
if (args.size() > 2) {
|
if (args.size() > 2) {
|
||||||
for (int i=2; i<args.size(); ++i) {
|
for (unsigned int i=2; i<args.size(); ++i) {
|
||||||
depends.push_back(args[i]);
|
depends.push_back(args[i]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -474,7 +474,7 @@ void cmMakefile::AddCustomCommand(const char* source,
|
||||||
std::string c = cmSystemTools::EscapeSpaces(command);
|
std::string c = cmSystemTools::EscapeSpaces(command);
|
||||||
|
|
||||||
std::string combinedArgs;
|
std::string combinedArgs;
|
||||||
int i;
|
unsigned int i;
|
||||||
|
|
||||||
for (i = 0; i < commandArgs.size(); ++i)
|
for (i = 0; i < commandArgs.size(); ++i)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1349,7 +1349,7 @@ void cmSystemTools::GlobDirs(const char *fullPath,
|
||||||
std::vector<std::string>& files)
|
std::vector<std::string>& files)
|
||||||
{
|
{
|
||||||
std::string path = fullPath;
|
std::string path = fullPath;
|
||||||
int pos = path.find("/*");
|
std::string::size_type pos = path.find("/*");
|
||||||
if(pos == std::string::npos)
|
if(pos == std::string::npos)
|
||||||
{
|
{
|
||||||
files.push_back(fullPath);
|
files.push_back(fullPath);
|
||||||
|
|
|
@ -645,7 +645,10 @@ void cmUnixMakefileGenerator::OutputTargets(std::ostream& fout)
|
||||||
case cmTarget::WIN32_EXECUTABLE:
|
case cmTarget::WIN32_EXECUTABLE:
|
||||||
this->OutputExecutableRule(fout, l->first.c_str(), l->second);
|
this->OutputExecutableRule(fout, l->first.c_str(), l->second);
|
||||||
break;
|
break;
|
||||||
|
case cmTarget::UTILITY:
|
||||||
|
case cmTarget::INSTALL_FILES:
|
||||||
|
case cmTarget::INSTALL_PROGRAMS:
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue