From c784d45ed74de32c28a49dc134df6f0104a92951 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nick=20=C3=98stergaard?= Date: Sat, 3 Sep 2016 20:36:20 +0200 Subject: [PATCH] Add new development build swtiches to version info Add: * KICAD_USE_SCH_IO_MANAGER * KICAD_USE_OCE --- CMakeLists.txt | 14 +++++++++++--- common/dialog_about/dialog_about.cpp | 14 ++++++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b3ba64545..7611489510 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,9 +18,9 @@ set( CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules ) # # KiCad build options should be added below. # -# If you add a new build option, please add it's state to the CopyVersionInfoToClipboard() -# function in common/basicframe.cpp so that build option settings can be included in bug -# reports. +# If you add a new build option, please add it's state to the +# OnCopyVersionInfo() function in common/dialog_about/dialog_about.cpp +# so that build option settings can be included in bug reports. # option( USE_WX_GRAPHICS_CONTEXT @@ -259,6 +259,14 @@ if( KICAD_SPICE ) add_definitions( -DKICAD_SPICE ) endif() +if( KICAD_USE_SCH_IO_MANAGER ) + add_definitions( -DKICAD_USE_SCH_IO_MANAGER ) +endif() + +if( KICAD_USE_OCE ) + add_definitions( -DKICAD_USE_OCE ) +endif() + if( USE_WX_GRAPHICS_CONTEXT OR APPLE ) add_definitions( -DUSE_WX_GRAPHICS_CONTEXT ) endif() diff --git a/common/dialog_about/dialog_about.cpp b/common/dialog_about/dialog_about.cpp index 26052ebbba..ccc2889df4 100644 --- a/common/dialog_about/dialog_about.cpp +++ b/common/dialog_about/dialog_about.cpp @@ -534,6 +534,20 @@ void dialog_about::OnCopyVersionInfo( wxCommandEvent& event ) msg_version << OFF; #endif + msg_version << " KICAD_USE_SCH_IO_MANAGER="; +#ifdef KICAD_USE_SCH_IO_MANAGER + msg_version << ON; +#else + msg_version << OFF; +#endif + + msg_version << " KICAD_USE_OCE="; +#ifdef KICAD_USE_OCE + msg_version << ON; +#else + msg_version << OFF; +#endif + wxTheClipboard->SetData( new wxTextDataObject( msg_version ) ); wxTheClipboard->Close(); copyVersionInfo->SetLabel( _( "Copied..." ) );