From 33170bc3716cc0432491c43b2652219f86c22f36 Mon Sep 17 00:00:00 2001
From: Bill Hoffman <bill.hoffman@kitware.com>
Date: Wed, 29 Nov 2006 17:17:16 -0500
Subject: ENH: there can be only one version

---
 Source/CursesDialog/cmCursesLongMessageForm.cxx | 5 +++--
 Source/CursesDialog/cmCursesMainForm.cxx        | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Source/CursesDialog/cmCursesLongMessageForm.cxx b/Source/CursesDialog/cmCursesLongMessageForm.cxx
index 3c4f5e9..04a5d09 100644
--- a/Source/CursesDialog/cmCursesLongMessageForm.cxx
+++ b/Source/CursesDialog/cmCursesLongMessageForm.cxx
@@ -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 @@ void cmCursesLongMessageForm::UpdateStatusBar()
 
   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);
diff --git a/Source/CursesDialog/cmCursesMainForm.cxx b/Source/CursesDialog/cmCursesMainForm.cxx
index 3443540..3258880 100644
--- a/Source/CursesDialog/cmCursesMainForm.cxx
+++ b/Source/CursesDialog/cmCursesMainForm.cxx
@@ -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 @@ void cmCursesMainForm::UpdateStatusBar(const char* message)
   // 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);
-- 
cgit v0.12