diff --git a/Source/FLTKDialog/CMakeSetupGUI.cxx b/Source/FLTKDialog/CMakeSetupGUI.cxx index 712aad8c8..3e2859193 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 2a26f929d..22322b78a 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 1c2761c4d..088732d1f 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 9d0a63e3d..a45ae3285 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::const_iterator iter; std::string entryKey; while(fin) { diff --git a/Source/cmForEachCommand.cxx b/Source/cmForEachCommand.cxx index 03f6d72a2..c36d11b80 100644 --- a/Source/cmForEachCommand.cxx +++ b/Source/cmForEachCommand.cxx @@ -58,7 +58,7 @@ IsFunctionBlocked(const char *name, const std::vector &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 newArgs; for (std::vector::const_iterator k = diff --git a/Source/cmIncludeExternalMSProjectCommand.cxx b/Source/cmIncludeExternalMSProjectCommand.cxx index 37333c2db..243d7e9f4 100644 --- a/Source/cmIncludeExternalMSProjectCommand.cxx +++ b/Source/cmIncludeExternalMSProjectCommand.cxx @@ -21,7 +21,7 @@ bool cmIncludeExternalMSProjectCommand::InitialPass(std::vector con std::vector depends; if (args.size() > 2) { - for (int i=2; i& 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 dad712e22..786a32ed5 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; } } }