Browse Source

ENH: tell cmake object where cmake is

Bill Hoffman 24 years ago
parent
commit
4ddee8e0e8

+ 2 - 2
Source/CursesDialog/ccurses.cxx

@@ -59,11 +59,11 @@ int main(int argc, char** argv)
 
   if ( argc == 2 )
     {
-    myform = new cmCursesMainForm(argv[1], newCache);
+    myform = new cmCursesMainForm(argv[1], argv[0], newCache);
     }
   else
     {
-    myform = new cmCursesMainForm("", newCache);
+    myform = new cmCursesMainForm("", argv[0], newCache);
     }
   myform->InitializeUI(w);
   myform->Render(1, 1, x, y);

+ 3 - 2
Source/CursesDialog/cmCursesMainForm.cxx

@@ -21,8 +21,9 @@ inline int ctrl(int z)
 } 
 
 cmCursesMainForm::cmCursesMainForm(const char* whereSource, 
+                                   const char* whereCMake,
 				   bool newCache) :
-  m_WhereSource(whereSource)
+  m_WhereSource(whereSource), m_WhereCMake(whereCMake)
 {
   m_Fields = 0;
   m_Window = 0;
@@ -331,7 +332,7 @@ void cmCursesMainForm::RunCMake(bool generateMakefiles)
   cmake make;
   // create the arguments for the cmake object
   std::vector<std::string> args;
-  args.push_back("cmake");
+  args.push_back(m_WhereCMake);
   if (m_WhereSource != "")
     {
     std::string arg;

+ 3 - 1
Source/CursesDialog/cmCursesMainForm.h

@@ -10,7 +10,8 @@ class cmCursesCacheEntryComposite;
 class cmCursesMainForm : public cmCursesForm
 {
 public:
-  cmCursesMainForm(const char* whereSource, bool newCache);
+  cmCursesMainForm(const char* whereSource, const char* whereCMake,
+                   bool newCache);
   virtual ~cmCursesMainForm();
   
   // Description:
@@ -62,6 +63,7 @@ protected:
   FIELD** m_Fields;
   WINDOW* m_Window;
   std::string m_WhereSource;
+  std::string m_WhereCMake;
   int m_Height;
 
 };