summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2001-11-13 17:38:53 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2001-11-13 17:38:53 (GMT)
commit41017cbc88b7f5e7de3df57f2626a7214eaeeb85 (patch)
tree26d46011cb0fa5243819d64840c088290d74cea5 /Source
parentf3ebd438c75da4534ee77514381976d800db7bef (diff)
downloadCMake-41017cbc88b7f5e7de3df57f2626a7214eaeeb85.zip
CMake-41017cbc88b7f5e7de3df57f2626a7214eaeeb85.tar.gz
CMake-41017cbc88b7f5e7de3df57f2626a7214eaeeb85.tar.bz2
ENH: clean up warnings
Diffstat (limited to 'Source')
-rw-r--r--Source/FLTKDialog/CMakeSetupGUI.cxx3
-rw-r--r--Source/FLTKDialog/CMakeSetupGUI.h2
-rw-r--r--Source/FLTKDialog/CMakeSetupGUIImplementation.cxx1
-rw-r--r--Source/cmCacheManager.cxx1
-rw-r--r--Source/cmForEachCommand.cxx2
-rw-r--r--Source/cmIncludeExternalMSProjectCommand.cxx2
-rw-r--r--Source/cmMakefile.cxx2
-rw-r--r--Source/cmSystemTools.cxx2
-rw-r--r--Source/cmUnixMakefileGenerator.cxx5
9 files changed, 12 insertions, 8 deletions
diff --git a/Source/FLTKDialog/CMakeSetupGUI.cxx b/Source/FLTKDialog/CMakeSetupGUI.cxx
index 712aad8..3e28591 100644
--- a/Source/FLTKDialog/CMakeSetupGUI.cxx
+++ b/Source/FLTKDialog/CMakeSetupGUI.cxx
@@ -88,7 +88,8 @@ void CMakeSetupGUI::cb_m_OKButton(Fl_Button* o, void* v) {
}
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;
o->callback((Fl_Callback*)cb_dialogWindow, (void*)(this));
{ Fl_Input* o = sourcePathTextInput = new Fl_Input(219, 15, 200, 20, "Where is the source code: ");
diff --git a/Source/FLTKDialog/CMakeSetupGUI.h b/Source/FLTKDialog/CMakeSetupGUI.h
index 2a26f92..22322b7 100644
--- a/Source/FLTKDialog/CMakeSetupGUI.h
+++ b/Source/FLTKDialog/CMakeSetupGUI.h
@@ -67,7 +67,7 @@ private:
inline void cb_m_OKButton_i(Fl_Button*, void*);
static void cb_m_OKButton(Fl_Button*, void*);
public:
- ~CMakeSetupGUI();
+ virtual ~CMakeSetupGUI();
virtual void Close(void);
virtual void BrowseForSourcePath(void);
virtual void BrowseForBinaryPath(void);
diff --git a/Source/FLTKDialog/CMakeSetupGUIImplementation.cxx b/Source/FLTKDialog/CMakeSetupGUIImplementation.cxx
index 1c2761c..088732d 100644
--- a/Source/FLTKDialog/CMakeSetupGUIImplementation.cxx
+++ b/Source/FLTKDialog/CMakeSetupGUIImplementation.cxx
@@ -518,6 +518,7 @@ CMakeSetupGUIImplementation
reverseOrder);
break;
case cmCacheManager::INTERNAL:
+ case cmCacheManager::STATIC:
// These entries should not be seen by the user
m_CacheEntriesList.RemoveProperty(key);
break;
diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx
index 9d0a63e..a45ae32 100644
--- a/Source/cmCacheManager.cxx
+++ b/Source/cmCacheManager.cxx
@@ -139,7 +139,6 @@ bool cmCacheManager::LoadCache(const char* path,
// input line is: "key":type=value
cmRegularExpression regQuoted("^\"([^\"]*)\":([^=]*)=(.*[^\t ]|[\t ]*)[\t ]*$");
- std::set<std::string>::const_iterator iter;
std::string entryKey;
while(fin)
{
diff --git a/Source/cmForEachCommand.cxx b/Source/cmForEachCommand.cxx
index 03f6d72..c36d11b 100644
--- a/Source/cmForEachCommand.cxx
+++ b/Source/cmForEachCommand.cxx
@@ -58,7 +58,7 @@ IsFunctionBlocked(const char *name, const std::vector<std::string> &args,
for( ; j != m_Args.end(); ++j)
{
// 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;
for (std::vector<std::string>::const_iterator k =
diff --git a/Source/cmIncludeExternalMSProjectCommand.cxx b/Source/cmIncludeExternalMSProjectCommand.cxx
index 37333c2..243d7e9 100644
--- a/Source/cmIncludeExternalMSProjectCommand.cxx
+++ b/Source/cmIncludeExternalMSProjectCommand.cxx
@@ -21,7 +21,7 @@ bool cmIncludeExternalMSProjectCommand::InitialPass(std::vector<std::string> con
std::vector<std::string> depends;
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]);
}
}
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 8e40fbc..377ebd2 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -474,7 +474,7 @@ void cmMakefile::AddCustomCommand(const char* source,
std::string c = cmSystemTools::EscapeSpaces(command);
std::string combinedArgs;
- int i;
+ unsigned int i;
for (i = 0; i < commandArgs.size(); ++i)
{
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index a99c5ef..1695dac 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1349,7 +1349,7 @@ void cmSystemTools::GlobDirs(const char *fullPath,
std::vector<std::string>& files)
{
std::string path = fullPath;
- int pos = path.find("/*");
+ std::string::size_type pos = path.find("/*");
if(pos == std::string::npos)
{
files.push_back(fullPath);
diff --git a/Source/cmUnixMakefileGenerator.cxx b/Source/cmUnixMakefileGenerator.cxx
index dad712e..786a32e 100644
--- a/Source/cmUnixMakefileGenerator.cxx
+++ b/Source/cmUnixMakefileGenerator.cxx
@@ -645,7 +645,10 @@ void cmUnixMakefileGenerator::OutputTargets(std::ostream& fout)
case cmTarget::WIN32_EXECUTABLE:
this->OutputExecutableRule(fout, l->first.c_str(), l->second);
break;
-
+ case cmTarget::UTILITY:
+ case cmTarget::INSTALL_FILES:
+ case cmTarget::INSTALL_PROGRAMS:
+ break;
}
}
}