haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor version information improvements. 

Include GTK+ version when appropriate so developers don't have to try to
figure out which version of GTK+ wxWidgets was built against.

Add KICAD_SPICE option status.
This commit is contained in:
Wayne Stambaugh 2017-09-01 08:18:27 -04:00
parent b0b3fde598
commit d190aa423f
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
common/dialog_about/dialog_about.cpp
View File

@ -424,6 +424,7 @@ void DIALOG_ABOUT::buildVersionInfoData( wxString& aMsg, bool aFormatHtml )
aMsg << "Version: " << m_info.GetBuildVersion() << eol; aMsg << "Version: " << m_info.GetBuildVersion() << eol;
aMsg << "Libraries:" << eol; aMsg << "Libraries:" << eol;
aMsg << indent4 << wxGetLibraryVersionInfo().GetVersionString() << eol; aMsg << indent4 << wxGetLibraryVersionInfo().GetVersionString() << eol;
#ifdef BUILD_GITHUB_PLUGIN #ifdef BUILD_GITHUB_PLUGIN
aMsg << indent4 << KICAD_CURL::GetVersion() << eol; aMsg << indent4 << KICAD_CURL::GetVersion() << eol;
#endif #endif
@ -434,7 +435,18 @@ void DIALOG_ABOUT::buildVersionInfoData( wxString& aMsg, bool aFormatHtml )
aMsg << "Build Info:" << eol; aMsg << "Build Info:" << eol;
aMsg << indent4 << "wxWidgets: " << wxVERSION_NUM_DOT_STRING << " ("; aMsg << indent4 << "wxWidgets: " << wxVERSION_NUM_DOT_STRING << " (";
aMsg << __WX_BO_UNICODE __WX_BO_STL __WX_BO_WXWIN_COMPAT_2_8 ")" << eol; aMsg << __WX_BO_UNICODE __WX_BO_STL __WX_BO_WXWIN_COMPAT_2_8 ")";
// Get the GTK+ version where possible.
#ifdef __WXGTK__
int major, minor;
major = wxPlatformInfo().Get().GetToolkitMajorVersion();
minor = wxPlatformInfo().Get().GetToolkitMinorVersion();
aMsg << " GTK+ " << major << "." << minor;
#endif
aMsg << eol;
aMsg << indent4 << "Boost: " << ( BOOST_VERSION / 100000 ) << wxT( "." ) aMsg << indent4 << "Boost: " << ( BOOST_VERSION / 100000 ) << wxT( "." )
<< ( BOOST_VERSION / 100 % 1000 ) << wxT( "." ) << ( BOOST_VERSION / 100 % 1000 ) << wxT( "." )
@ -444,7 +456,7 @@ void DIALOG_ABOUT::buildVersionInfoData( wxString& aMsg, bool aFormatHtml )
aMsg << indent4 << "Curl: " << LIBCURL_VERSION << eol; aMsg << indent4 << "Curl: " << LIBCURL_VERSION << eol;
#endif #endif
aMsg << indent4 << "KiCad compiler: "; aMsg << indent4 << "Compiler: ";
#if defined(__clang__) #if defined(__clang__)
aMsg << "Clang " << __clang_major__ << "." << __clang_minor__ << "." << __clang_patchlevel__; aMsg << "Clang " << __clang_major__ << "." << __clang_minor__ << "." << __clang_patchlevel__;
#elif defined(__GNUG__) #elif defined(__GNUG__)
@ -460,11 +472,12 @@ void DIALOG_ABOUT::buildVersionInfoData( wxString& aMsg, bool aFormatHtml )
#if defined(__GXX_ABI_VERSION) #if defined(__GXX_ABI_VERSION)
aMsg << " with C++ ABI " << __GXX_ABI_VERSION << eol; aMsg << " with C++ ABI " << __GXX_ABI_VERSION << eol;
#else #else
aMsg << " without C++ ABI\n"; aMsg << " without C++ ABI";
#endif #endif
// Add build settings config (build options): aMsg << eol;
// Add build settings config (build options):
aMsg << "Build settings:" << eol; aMsg << "Build settings:" << eol;
aMsg << indent4 << "USE_WX_GRAPHICS_CONTEXT="; aMsg << indent4 << "USE_WX_GRAPHICS_CONTEXT=";
@ -522,6 +535,13 @@ void DIALOG_ABOUT::buildVersionInfoData( wxString& aMsg, bool aFormatHtml )
#else #else
aMsg << OFF; aMsg << OFF;
#endif #endif
aMsg << indent4 << "KICAD_SPICE=";
#ifdef KICAD_SPICE
aMsg << ON;
#else
aMsg << OFF;
#endif
} }