ENH: patch from Miguel

- cleaning up a bit: static helper functions, remove unused scanner profiles, remove unused variables, etc.
- correct <name> entry in .project file
- converts the make command and other paths obtained from cygwin cmake to windows style paths
- provide environment setup for compiling with nmake
- create linked resources and path entries for executable/library_output_path's not subdirs of binary path
- fixes incorrect exclusions of output dirs when named the same as source dir
- excludes the CMakeFiles subdirs from the directories to scan for output targets
- removes possible redundant entries in <pathentry include ...>
- adds the all and preinstall targets to the target list
- removes the linked resources for non out-of-source builds and conflicting dirs

Alex

1 files changed, 20 insertions, 17 deletions

diff --git a/Source/cmExtraEclipseCDT4Generator.h b/Source/cmExtraEclipseCDT4Generator.h
index 17fd10d013..4ed720fb58 100644
--- a/Source/cmExtraEclipseCDT4Generator.h
+++ b/Source/cmExtraEclipseCDT4Generator.h
@@ -68,26 +68,29 @@ private:
     EclipseToolchainSolaris,
     EclipseToolchainMacOSX
     };
-  EclipseToolchainType GetToolChainType(const cmMakefile& makefile) const;
+  static EclipseToolchainType GetToolChainType(const cmMakefile& makefile);
 
   // If built with cygwin cmake, convert posix to windows path.
-  std::string GetEclipsePath(const std::string& path) const;
-  
+  static std::string GetEclipsePath(const std::string& path);
+
+  // Extract basename.
+  static std::string GetPathBasename(const std::string& path);
+
   // Helper functions
-  void AppendStorageScanners(cmGeneratedFileStream& fout,
-                             const cmMakefile&      makefile) const;
-  void AppendTarget         (cmGeneratedFileStream& fout,
-                             const std::string&     target) const;
-  void AppendScannerProfile (cmGeneratedFileStream& fout,
-                             const std::string&     profileID,
-                             bool                   openActionEnabled,
-                             const std::string&     openActionFilePath,
-                             bool                   pParserEnabled,
-                             const std::string&     scannerInfoProviderID,
-                             const std::string&     runActionArguments,
-                             const std::string&     runActionCommand,
-                             bool                   runActionUseDefault,
-                             bool                   sipParserEnabled) const;
+  static void AppendStorageScanners(cmGeneratedFileStream& fout);
+  static void AppendTarget         (cmGeneratedFileStream& fout,
+                                    const std::string&     target,
+                                    const std::string&     make);
+  static void AppendScannerProfile (cmGeneratedFileStream& fout,
+                                    const std::string&   profileID,
+                                    bool                 openActionEnabled,
+                                    const std::string&   openActionFilePath,
+                                    bool                 pParserEnabled,
+                                    const std::string&   scannerInfoProviderID,
+                                    const std::string&   runActionArguments,
+                                    const std::string&   runActionCommand,
+                                    bool                 runActionUseDefault,
+                                    bool                 sipParserEnabled);
 };
 
 #endif