[cmake-commits] hoffman committed CMakeLists.txt 1.24 1.25 CMakeSetupFrame.cpp 1.2 1.3

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/WXDialog
In directory public:/mounts/ram/cvs-serv18255

Modified Files:
	CMakeLists.txt CMakeSetupFrame.cpp 
Log Message:
ENH: fix the compile and add install rule


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/WXDialog/CMakeLists.txt,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- CMakeLists.txt	21 Jul 2006 19:43:18 -0000	1.24
+++ CMakeLists.txt	5 Nov 2007 19:47:20 -0000	1.25
@@ -83,5 +83,5 @@
   # 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)

Index: CMakeSetupFrame.cpp
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/WXDialog/CMakeSetupFrame.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CMakeSetupFrame.cpp	8 Aug 2005 21:14:08 -0000	1.2
+++ CMakeSetupFrame.cpp	5 Nov 2007 19:47:20 -0000	1.3
@@ -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 @@
     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 @@
         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);