ENH: fix the compile and add install rule

2 files changed, 6 insertions, 3 deletions

diff --git a/Source/WXDialog/CMakeLists.txt b/Source/WXDialog/CMakeLists.txt
index fc42494..9ee8b91 100644
--- a/Source/WXDialog/CMakeLists.txt
+++ b/Source/WXDialog/CMakeLists.txt
@@ -83,5 +83,5 @@ IF(wxWidgets_FOUND)
   # if the checkbox view functionality is not desired,
   # exclude this part from the smple
   TARGET_LINK_LIBRARIES(WXDialog ${wxWidgets_LIBRARIES} cmsys CMakeLib)
-
+  INSTALL_TARGETS(/bin WXDialog)
 ENDIF(wxWidgets_FOUND)
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);