浏览代码

ENH: Make FindMakeProgram public

Andy Cedilnik 20 年之前
父节点
当前提交
f812d053f6
共有 1 个文件被更改,包括 8 次插入3 次删除
  1. 8 3
      Source/cmGlobalGenerator.h

+ 8 - 3
Source/cmGlobalGenerator.h

@@ -98,8 +98,9 @@ public:
                     std::string *output, 
                     std::string *output, 
                     const char *makeProgram, const char *config,
                     const char *makeProgram, const char *config,
                     bool clean);
                     bool clean);
-  virtual std::string GenerateBuildCommand(const char* makeProgram, const char *projectName, const char *targetName,
-                    const char* config, bool ignoreErrors);
+  virtual std::string GenerateBuildCommand(const char* makeProgram,
+    const char *projectName, const char *targetName,
+    const char* config, bool ignoreErrors);
 
 
   ///! Set the CMake instance
   ///! Set the CMake instance
   void SetCMakeInstance(cmake *cm) {
   void SetCMakeInstance(cmake *cm) {
@@ -137,11 +138,15 @@ public:
   std::string ConvertToRelativePath(const std::vector<std::string>& local,
   std::string ConvertToRelativePath(const std::vector<std::string>& local,
                                     const char* remote);
                                     const char* remote);
 
 
+  /*
+   * Determine what program to use for building the project.
+   */
+  void FindMakeProgram(cmMakefile*);
+
 protected:
 protected:
   // Fill the m_ProjectMap, this must be called after m_LocalGenerators has been populated.
   // Fill the m_ProjectMap, this must be called after m_LocalGenerators has been populated.
   void FillProjectMap();
   void FillProjectMap();
   bool IsExcluded(cmLocalGenerator* root, cmLocalGenerator* gen);
   bool IsExcluded(cmLocalGenerator* root, cmLocalGenerator* gen);
-  void FindMakeProgram(cmMakefile*);
 
 
   void ConfigureRelativePaths();
   void ConfigureRelativePaths();
   void SetupTests();
   void SetupTests();