[cmake-commits] hoffman committed cmCursesLongMessageForm.cxx 1.14 1.15 cmCursesMainForm.cxx 1.70 1.71

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/CursesDialog
In directory public:/mounts/ram/cvs-serv9332/Source/CursesDialog

Modified Files:
	cmCursesLongMessageForm.cxx cmCursesMainForm.cxx 
Log Message:
ENH: there can be only one version


Index: cmCursesLongMessageForm.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CursesDialog/cmCursesLongMessageForm.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- cmCursesLongMessageForm.cxx	16 Mar 2006 15:44:55 -0000	1.14
+++ cmCursesLongMessageForm.cxx	29 Nov 2006 22:17:16 -0000	1.15
@@ -17,6 +17,7 @@
 #include "../cmCacheManager.h"
 #include "../cmSystemTools.h"
 #include "../cmake.h"
+#include "../cmVersion.h"
 #include "cmCursesLongMessageForm.h"
 #include "cmCursesMainForm.h"
 
@@ -79,8 +80,8 @@
 
   char version[cmCursesMainForm::MAX_WIDTH];
   char vertmp[128];
-  sprintf(vertmp,"CMake Version %d.%d - %s", cmake::GetMajorVersion(),
-          cmake::GetMinorVersion(),cmake::GetReleaseVersion());
+  sprintf(vertmp,"CMake Version %d.%d - %s", cmVersion::GetMajorVersion(),
+          cmVersion::GetMinorVersion(),cmVersion::GetReleaseVersion());
   int sideSpace = (width-strlen(vertmp));
   for(int i=0; i<sideSpace; i++) { version[i] = ' '; }
   sprintf(version+sideSpace, "%s", vertmp);

Index: cmCursesMainForm.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CursesDialog/cmCursesMainForm.cxx,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- cmCursesMainForm.cxx	6 Oct 2006 19:33:16 -0000	1.70
+++ cmCursesMainForm.cxx	29 Nov 2006 22:17:16 -0000	1.71
@@ -16,6 +16,7 @@
 =========================================================================*/
 #include "../cmCacheManager.h"
 #include "../cmSystemTools.h"
+#include "../cmVersion.h"
 #include "../cmake.h"
 #include "cmCursesMainForm.h"
 #include "cmCursesStringWidget.h"
@@ -579,8 +580,8 @@
   // We want to display this on the right
   char version[cmCursesMainForm::MAX_WIDTH];
   char vertmp[128];
-  sprintf(vertmp,"CMake Version %d.%d - %s", cmake::GetMajorVersion(),
-          cmake::GetMinorVersion(),cmake::GetReleaseVersion());
+  sprintf(vertmp,"CMake Version %d.%d - %s", cmVersion::GetMajorVersion(),
+          cmVersion::GetMinorVersion(),cmVersion::GetReleaseVersion().c_str());
   int sideSpace = (width-strlen(vertmp));
   for(i=0; i<sideSpace; i++) { version[i] = ' '; }
   sprintf(version+sideSpace, "%s", vertmp);