From a65193857293f065139bc991488d0cef9a199c16 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Mon, 5 Nov 2007 14:47:20 -0500 Subject: [PATCH] ENH: fix the compile and add install rule --- Source/WXDialog/CMakeLists.txt | 2 +- Source/WXDialog/CMakeSetupFrame.cpp | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Source/WXDialog/CMakeLists.txt b/Source/WXDialog/CMakeLists.txt index fc42494df..9ee8b9153 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 9c2aad838..0e0bdca3d 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);