summaryrefslogtreecommitdiffstats
path: root/Source/WXDialog/CMakeSetupFrame.cpp
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2007-11-05 19:47:20 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2007-11-05 19:47:20 (GMT)
commita65193857293f065139bc991488d0cef9a199c16 (patch)
treee3ed5991e102a7b4b6de7b03cd0d0ea0971a8523 /Source/WXDialog/CMakeSetupFrame.cpp
parentf410f8578eea403d0ca657e46ec7659cd0f805e7 (diff)
downloadCMake-a65193857293f065139bc991488d0cef9a199c16.zip
CMake-a65193857293f065139bc991488d0cef9a199c16.tar.gz
CMake-a65193857293f065139bc991488d0cef9a199c16.tar.bz2
ENH: fix the compile and add install rule
Diffstat (limited to 'Source/WXDialog/CMakeSetupFrame.cpp')
-rw-r--r--Source/WXDialog/CMakeSetupFrame.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/WXDialog/CMakeSetupFrame.cpp b/Source/WXDialog/CMakeSetupFrame.cpp
index 9c2aad8..0e0bdca 100644
--- a/Source/WXDialog/CMakeSetupFrame.cpp
+++ b/Source/WXDialog/CMakeSetupFrame.cpp
@@ -46,6 +46,7 @@
#include "aboutdlg.h"
// cmake includes
+#include "../cmVersion.h"
#include "../cmListFileCache.h"
#include "../cmCacheManager.h"
#include "../cmGlobalGenerator.h"
@@ -699,7 +700,9 @@ void CMakeSetupFrm::DoInitFrame(cmCommandLineInfo &cm, const wxString &fn)
m_cmGeneratorChoice->SetStringSelection(generator);
wxString str;
- //str.Printf("CMake %d.%d - %s", cmake::GetMajorVersion(), cmake::GetMinorVersion(), cmake::GetReleaseVersion());
+ str.Printf("CMake %d.%d - %s", cmVersion::GetMajorVersion(),
+ cmVersion::GetMinorVersion(),
+ cmVersion::GetReleaseVersion().c_str());
str.Printf("CMakeSetup v%i.%i%s", CMAKEGUI_MAJORVER, CMAKEGUI_MINORVER, CMAKEGUI_ADDVER);
SetTitle(str);
@@ -1693,7 +1696,7 @@ void CMakeSetupFrm::OnAboutClick( wxCommandEvent& event )
generators.Add(i->c_str());
wxString cmversion, cmsversion;
- cmversion.Printf("v%i.%i %s", cmake::GetMajorVersion(), cmake::GetMinorVersion(), cmake::GetReleaseVersion());
+// cmversion.Printf("v%i.%i %s", cmake::GetMajorVersion(), cmake::GetMinorVersion(), cmake::GetReleaseVersion());
cmsversion.Printf("v%i.%i%s", CMAKEGUI_MAJORVER, CMAKEGUI_MINORVER, CMAKEGUI_ADDVER);
dlg->SetAboutText(cmversion, cmsversion, generators);