ENH: On envocation of ccmake check if directories are correct, but do not rerun configure
This commit is contained in:
parent
1e09bc5dde
commit
dfd22fdf23
|
@ -189,8 +189,11 @@ int main(int argc, char** argv)
|
||||||
cmCursesForm::CurrentForm = myform;
|
cmCursesForm::CurrentForm = myform;
|
||||||
|
|
||||||
myform->InitializeUI();
|
myform->InitializeUI();
|
||||||
|
if ( myform->Configure(1) == 0 )
|
||||||
|
{
|
||||||
myform->Render(1, 1, x, y);
|
myform->Render(1, 1, x, y);
|
||||||
myform->HandleInput();
|
myform->HandleInput();
|
||||||
|
}
|
||||||
|
|
||||||
// Need to clean-up better
|
// Need to clean-up better
|
||||||
curses_clear();
|
curses_clear();
|
||||||
|
|
|
@ -624,9 +624,8 @@ void cmCursesMainForm::UpdateProgress(const char *msg, float prog, void* vp)
|
||||||
refresh();
|
refresh();
|
||||||
}
|
}
|
||||||
|
|
||||||
int cmCursesMainForm::Configure()
|
int cmCursesMainForm::Configure(int noconfigure)
|
||||||
{
|
{
|
||||||
|
|
||||||
int xi,yi;
|
int xi,yi;
|
||||||
getmaxyx(stdscr, yi, xi);
|
getmaxyx(stdscr, yi, xi);
|
||||||
|
|
||||||
|
@ -648,7 +647,19 @@ int cmCursesMainForm::Configure()
|
||||||
|
|
||||||
// run the generate process
|
// run the generate process
|
||||||
m_OkToGenerate = true;
|
m_OkToGenerate = true;
|
||||||
int retVal = this->m_CMakeInstance->Configure();
|
int retVal;
|
||||||
|
if ( noconfigure )
|
||||||
|
{
|
||||||
|
retVal = this->m_CMakeInstance->DoPreConfigureChecks();
|
||||||
|
if ( retVal > 0 )
|
||||||
|
{
|
||||||
|
retVal = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
retVal = this->m_CMakeInstance->Configure();
|
||||||
|
}
|
||||||
this->m_CMakeInstance->SetProgressCallback(0, 0);
|
this->m_CMakeInstance->SetProgressCallback(0, 0);
|
||||||
|
|
||||||
keypad(stdscr,TRUE); /* Use key symbols as
|
keypad(stdscr,TRUE); /* Use key symbols as
|
||||||
|
|
|
@ -89,9 +89,10 @@ public:
|
||||||
virtual void AddError(const char* message, const char* title);
|
virtual void AddError(const char* message, const char* title);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Used to do a configure.
|
* Used to do a configure. If argument is specified, it does only the check
|
||||||
|
* and not configure.
|
||||||
*/
|
*/
|
||||||
int Configure();
|
int Configure(int noconfigure=0);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Used to generate
|
* Used to generate
|
||||||
|
|
Loading…
Reference in New Issue