kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: there can be only one version

Browse Source
This commit is contained in:
Bill Hoffman 2006-11-29 17:17:16 -05:00
parent 2915f24274
commit 33170bc371
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/CursesDialog/cmCursesLongMessageForm.cxx
View File

@ -17,6 +17,7 @@
#include "../cmCacheManager.h" #include "../cmCacheManager.h"
#include "../cmSystemTools.h" #include "../cmSystemTools.h"
#include "../cmake.h" #include "../cmake.h"
#include "../cmVersion.h"
#include "cmCursesLongMessageForm.h" #include "cmCursesLongMessageForm.h"
#include "cmCursesMainForm.h" #include "cmCursesMainForm.h"
@ -79,8 +80,8 @@ void cmCursesLongMessageForm::UpdateStatusBar()
char version[cmCursesMainForm::MAX_WIDTH]; char version[cmCursesMainForm::MAX_WIDTH];
char vertmp[128]; char vertmp[128];
sprintf(vertmp,"CMake Version %d.%d - %s", cmake::GetMajorVersion(), sprintf(vertmp,"CMake Version %d.%d - %s", cmVersion::GetMajorVersion(),
cmake::GetMinorVersion(),cmake::GetReleaseVersion()); cmVersion::GetMinorVersion(),cmVersion::GetReleaseVersion());
int sideSpace = (width-strlen(vertmp)); int sideSpace = (width-strlen(vertmp));
for(int i=0; i<sideSpace; i++) { version[i] = ' '; } for(int i=0; i<sideSpace; i++) { version[i] = ' '; }
sprintf(version+sideSpace, "%s", vertmp); sprintf(version+sideSpace, "%s", vertmp);

5
Source/CursesDialog/cmCursesMainForm.cxx
View File

@ -16,6 +16,7 @@
=========================================================================*/ =========================================================================*/
#include "../cmCacheManager.h" #include "../cmCacheManager.h"
#include "../cmSystemTools.h" #include "../cmSystemTools.h"
#include "../cmVersion.h"
#include "../cmake.h" #include "../cmake.h"
#include "cmCursesMainForm.h" #include "cmCursesMainForm.h"
#include "cmCursesStringWidget.h" #include "cmCursesStringWidget.h"
@ -579,8 +580,8 @@ void cmCursesMainForm::UpdateStatusBar(const char* message)
// We want to display this on the right // We want to display this on the right
char version[cmCursesMainForm::MAX_WIDTH]; char version[cmCursesMainForm::MAX_WIDTH];
char vertmp[128]; char vertmp[128];
sprintf(vertmp,"CMake Version %d.%d - %s", cmake::GetMajorVersion(), sprintf(vertmp,"CMake Version %d.%d - %s", cmVersion::GetMajorVersion(),
cmake::GetMinorVersion(),cmake::GetReleaseVersion()); cmVersion::GetMinorVersion(),cmVersion::GetReleaseVersion().c_str());
int sideSpace = (width-strlen(vertmp)); int sideSpace = (width-strlen(vertmp));
for(i=0; i<sideSpace; i++) { version[i] = ' '; } for(i=0; i<sideSpace; i++) { version[i] = ' '; }
sprintf(version+sideSpace, "%s", vertmp); sprintf(version+sideSpace, "%s", vertmp);