ENH: fix the compile and add install rule
This commit is contained in:
parent
f410f8578e
commit
a651938572
|
@ -83,5 +83,5 @@ IF(wxWidgets_FOUND)
|
||||||
# if the checkbox view functionality is not desired,
|
# if the checkbox view functionality is not desired,
|
||||||
# exclude this part from the smple
|
# exclude this part from the smple
|
||||||
TARGET_LINK_LIBRARIES(WXDialog ${wxWidgets_LIBRARIES} cmsys CMakeLib)
|
TARGET_LINK_LIBRARIES(WXDialog ${wxWidgets_LIBRARIES} cmsys CMakeLib)
|
||||||
|
INSTALL_TARGETS(/bin WXDialog)
|
||||||
ENDIF(wxWidgets_FOUND)
|
ENDIF(wxWidgets_FOUND)
|
||||||
|
|
|
@ -46,6 +46,7 @@
|
||||||
#include "aboutdlg.h"
|
#include "aboutdlg.h"
|
||||||
|
|
||||||
// cmake includes
|
// cmake includes
|
||||||
|
#include "../cmVersion.h"
|
||||||
#include "../cmListFileCache.h"
|
#include "../cmListFileCache.h"
|
||||||
#include "../cmCacheManager.h"
|
#include "../cmCacheManager.h"
|
||||||
#include "../cmGlobalGenerator.h"
|
#include "../cmGlobalGenerator.h"
|
||||||
|
@ -699,7 +700,9 @@ void CMakeSetupFrm::DoInitFrame(cmCommandLineInfo &cm, const wxString &fn)
|
||||||
m_cmGeneratorChoice->SetStringSelection(generator);
|
m_cmGeneratorChoice->SetStringSelection(generator);
|
||||||
|
|
||||||
wxString str;
|
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);
|
str.Printf("CMakeSetup v%i.%i%s", CMAKEGUI_MAJORVER, CMAKEGUI_MINORVER, CMAKEGUI_ADDVER);
|
||||||
|
|
||||||
SetTitle(str);
|
SetTitle(str);
|
||||||
|
@ -1693,7 +1696,7 @@ void CMakeSetupFrm::OnAboutClick( wxCommandEvent& event )
|
||||||
generators.Add(i->c_str());
|
generators.Add(i->c_str());
|
||||||
|
|
||||||
wxString cmversion, cmsversion;
|
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);
|
cmsversion.Printf("v%i.%i%s", CMAKEGUI_MAJORVER, CMAKEGUI_MINORVER, CMAKEGUI_ADDVER);
|
||||||
|
|
||||||
dlg->SetAboutText(cmversion, cmsversion, generators);
|
dlg->SetAboutText(cmversion, cmsversion, generators);
|
||||||
|
|
Loading…
Reference in New Issue