diff options
author | Bill Hoffman <bill.hoffman@kitware.com> | 2001-11-06 17:03:36 (GMT) |
---|---|---|
committer | Bill Hoffman <bill.hoffman@kitware.com> | 2001-11-06 17:03:36 (GMT) |
commit | 4ddee8e0e8c16364c7b201d640374d822b6cdeda (patch) | |
tree | 0a86c0aeb787b02dcc883d8219fd0b117742f4a7 /Source/CursesDialog | |
parent | 319a5e007713726e1548148045b157eb286f1ef9 (diff) | |
download | CMake-4ddee8e0e8c16364c7b201d640374d822b6cdeda.zip CMake-4ddee8e0e8c16364c7b201d640374d822b6cdeda.tar.gz CMake-4ddee8e0e8c16364c7b201d640374d822b6cdeda.tar.bz2 |
ENH: tell cmake object where cmake is
Diffstat (limited to 'Source/CursesDialog')
-rw-r--r-- | Source/CursesDialog/ccurses.cxx | 4 | ||||
-rw-r--r-- | Source/CursesDialog/cmCursesMainForm.cxx | 5 | ||||
-rw-r--r-- | Source/CursesDialog/cmCursesMainForm.h | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/Source/CursesDialog/ccurses.cxx b/Source/CursesDialog/ccurses.cxx index b89f16c..6d9b34a 100644 --- a/Source/CursesDialog/ccurses.cxx +++ b/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); diff --git a/Source/CursesDialog/cmCursesMainForm.cxx b/Source/CursesDialog/cmCursesMainForm.cxx index 57811ed..7f29128 100644 --- a/Source/CursesDialog/cmCursesMainForm.cxx +++ b/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; diff --git a/Source/CursesDialog/cmCursesMainForm.h b/Source/CursesDialog/cmCursesMainForm.h index 2408cf2..d03a874 100644 --- a/Source/CursesDialog/cmCursesMainForm.h +++ b/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; }; |