Commit 56995b33 authored by dickelbeck's avatar dickelbeck
Browse files

AUI support into topmost CMakeLists.txt

parent b2f9d5bd

3d-viewer/3d_frame.cpp

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ WinEDA3D_DrawFrame::WinEDA3D_DrawFrame( WinEDA_BasePcbFrame* parent, 
    // Make a Pcb3D_GLCanvas

    m_Canvas = new Pcb3D_GLCanvas( this );



#if KICAD_AUIMANAGER

#if defined(KICAD_AUIMANAGER)

    m_auimgr.SetManagedWindow( this );



    wxAuiPaneInfo horiz;

3d-viewer/3d_toolbar.cpp

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ void WinEDA3D_DrawFrame::ReCreateHToolbar() 


    m_HToolBar = new WinEDA_Toolbar( TOOLBAR_MAIN, this, ID_H_TOOLBAR, TRUE );



#if !KICAD_AUIMANAGER

#if !defined(KICAD_AUIMANAGER)

    SetToolBar( (wxToolBar*) m_HToolBar );

#endif

3d-viewer/3d_viewer.h

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ public: 
    wxPoint      m_FramePos;

    wxSize       m_FrameSize;



#if KICAD_AUIMANAGER

#if defined(KICAD_AUIMANAGER)

    wxAuiManager m_auimgr;

    ~WinEDA3D_DrawFrame() { m_auimgr.UnInit(); };

#endif

CHANGELOG.txt

+7 −0
Original line number Diff line number Diff line
@@ -4,6 +4,13 @@ KiCad ChangeLog 2009 
Please add newer entries at the top, list the date and your name with

email address.





2009-Nov-5 UPDATE Dick Hollenbeck <dick@softplc.com>

================================================================================

++all

    CMakeLists.txt support for AUI.





2009-Nov-04 UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>

================================================================================

++pcbnew

CMakeLists.txt

+17 −1
Original line number Diff line number Diff line
@@ -19,6 +19,16 @@ option(KICAD_CYRILLIC "enable/disable building using cyrillic (needs unicode) (d 
option(wxUSE_UNICODE "enable/disable building unicode (default OFF)")

option(KICAD_GOST "enable/disable building using GOST notation for multiple gates per package (default OFF)")





if(APPLE)

    option(KICAD_AUIMANAGER "Enable use of wxAuiManager (default ON)" ON)

    option(KICAD_AUITOOLBAR "Enable use of wxAuiToolBar (default ON)" ON)

else(APPLE)

    option(KICAD_AUIMANAGER "Enable use of wxAuiManager (default OFF)" OFF)

    option(KICAD_AUITOOLBAR "Enable use of wxAuiToolBar (default OFF)" OFF)

endif(APPLE)





# Comment this out if you don't want to build with Python support.

# OPTION(KICAD_PYTHON "enable/disable building with Python support (default OFF)")
@@ -119,7 +129,12 @@ check_find_package_result(OPENGL_FOUND "OpenGL") 
# Here you can define what libraries of wxWidgets you need for your

# application. You can figure out what libraries you need here;

# http://www.wxwidgets.org/manuals/2.8/wx_librarieslist.html



if( KICAD_AUIMANAGER OR KICAD_AUITOOLBAR )

    find_package(wxWidgets COMPONENTS gl html adv core net base aui QUIET)

else( KICAD_AUIMANAGER OR KICAD_AUITOOLBAR )

    find_package(wxWidgets COMPONENTS gl html adv core net base QUIET)

endif( KICAD_AUIMANAGER OR KICAD_AUITOOLBAR )

check_find_package_result(wxWidgets_FOUND "wxWidgets")
@@ -129,6 +144,7 @@ include(${wxWidgets_USE_FILE}) 
# Include MinGW resource compiler.

include(MinGWResourceCompiler)





# Generate build system specific header file.

include(PerformFeatureChecks)

perform_feature_checks()