Commit f5a86893 authored by Garth Corral's avatar Garth Corral
Browse files

Merge trunk @ 5256

parents c9d3fd6d 3764021e

CMakeLists.txt

+5 −4
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ add_definitions( -DWX_COMPATIBILITY ) 
# See line 41 of CMakeModules/FindwxWidgets.cmake

set( wxWidgets_CONFIG_OPTIONS --static=no )



find_package( wxWidgets 3.0.0 COMPONENTS gl aui adv html core net base xml REQUIRED )

find_package( wxWidgets 3.0.0 COMPONENTS gl adv html core net base xml REQUIRED )



# Include wxWidgets macros.

include( ${wxWidgets_USE_FILE} )
@@ -435,8 +435,8 @@ if( APPLE AND USE_OSX_DEPS_BUILDER ) 
    # This should be built in all cases, if swig exec is not available

    # will be impossible also enable SCRIPTING being for PCBNEW required immediately



    include( download_pcre )

    include( download_swig )

    #include( download_pcre )

    #include( download_swig )





    #set(CMAKE_FIND_LIBRARY_SUFFIXES ".a;.so;.dylib;.dll")
@@ -462,6 +462,7 @@ if( APPLE AND USE_OSX_DEPS_BUILDER ) 
        message(STATUS "Scripting ENABLED")

        include( download_wxpython )



        set( SWIG_ROOT        /opt/local )

        set( SWIG_EXECUTABLE  ${SWIG_ROOT}/bin/swig )

        set( SWIG_INCLUDE     ${SWIG_ROOT}/include )

        set( PYTHON_DEST ${LIBWXPYTHON_ROOT}/wxPython/lib/python2.6/site-packages )
@@ -476,7 +477,7 @@ if( APPLE AND USE_OSX_DEPS_BUILDER ) 
        set( PYTHON_DEST ${LIBWXPYTHON_ROOT}/wxPython/lib/python2.6/site-packages )



        add_dependencies( lib-dependencies libwxpython )

        add_dependencies( lib-dependencies swig )

        #add_dependencies( lib-dependencies swig )

    else()

        include( download_wxwidgets )

        add_dependencies( lib-dependencies libwx )

CMakeModules/download_boost.cmake

+4 −0
Original line number Diff line number Diff line
@@ -159,6 +159,10 @@ if( APPLE ) 
            message( "-- BOOST found 32/64 Address Model" )



            set( BOOST_ADDRESSMODEL "address-model=32_64" )

        else()

            message( "-- BOOST found 64 Address Model" )



            set( BOOST_ADDRESSMODEL "address-model=64" )

        endif()



        if( (CMAKE_OSX_ARCHITECTURES MATCHES "x86_64" OR CMAKE_OSX_ARCHITECTURES MATCHES "386") AND

common/hotkeys_basic.cpp

+1 −1
Original line number Diff line number Diff line
@@ -770,7 +770,7 @@ void AddHotkeyConfigMenu( wxMenu* aMenu ) 


    // Append HotkeySubmenu to menu

    AddMenuItem( aMenu, HotkeySubmenu,

                 ID_PREFERENCES_HOTKEY_SUBMENU, _( "&Hotkeys" ),

                 wxID_ANY, _( "&Hotkeys" ),

                 _( "Hotkeys configuration and preferences" ),

                 KiBitmap( hotkeys_xpm ) );

}

eeschema/dialogs/dialog_plot_schematic.cpp

+9 −10
Original line number Diff line number Diff line
@@ -176,21 +176,20 @@ void DIALOG_PLOT_SCHEMATIC::OnOutputDirectoryBrowseClicked( wxCommandEvent& even 


    wxFileName      dirName = wxFileName::DirName( dirDialog.GetPath() );



    wxMessageDialog dialog( this, _( "Use a relative path? " ),

                            _( "Plot Output Directory" ),

    fn = Prj().AbsolutePath( g_RootSheet->GetFileName() );

    wxString defaultPath = fn.GetPathWithSep();

    wxString msg;

    msg.Printf( _( "Do you want to use a path relative to\n'%s'" ),

                GetChars( defaultPath ) );



    wxMessageDialog dialog( this, msg, _( "Plot Output Directory" ),

                            wxYES_NO | wxICON_QUESTION | wxYES_DEFAULT );



    // relative directory selected

    if( dialog.ShowModal() == wxID_YES )

    {



        wxString plotFilePath = g_RootSheet->GetFileName();



        plotFilePath = Prj().AbsolutePath(plotFilePath);

        plotFilePath = wxPathOnly( plotFilePath );



        if( !dirName.MakeRelativeTo( plotFilePath ) )

            wxMessageBox( _( "Cannot make path relative (target volume different from board file volume)!" ),

        if( !dirName.MakeRelativeTo( defaultPath ) )

            wxMessageBox( _( "Cannot make path relative (target volume different from file volume)!" ),

                          _( "Plot Output Directory" ), wxOK | wxICON_ERROR );

    }

include/id.h

+0 −1
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ enum main_id 
    ID_CONFIG_READ,



    ID_PREFERENCES_HOTKEY_START,

    ID_PREFERENCES_HOTKEY_SUBMENU,

    ID_PREFERENCES_HOTKEY_EXPORT_CONFIG,

    ID_PREFERENCES_HOTKEY_IMPORT_CONFIG,

    ID_PREFERENCES_HOTKEY_SHOW_EDITOR,