Commit a8e57e10 authored by jean-pierre charras's avatar jean-pierre charras
Browse files

Remove wxUSE_UNICODE definition from CMakeLists.txt, because this define comes... 

Remove wxUSE_UNICODE definition from CMakeLists.txt, because this define comes from wxWidgets and should not be made inside kicad
Remove KICAD_GOST option because it is  now useless: the 2 GOST options are now selectable at run time and are:
* specific page layouts (now user definable, and the GOST page layouts are available in template folder)
* notation for multiple parts per package (made in eeschema, preference menu)
parent 7c340f6b

CMakeLists.txt

+0 −12
Original line number Diff line number Diff line
@@ -14,10 +14,6 @@ set( CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules ) 
# reports.

#



# Russian GOST patch

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)" )



#for those who bored with uppercase

option( KICAD_KEEPCASE "turn-off automatic component name conversion to uppercase if selected" )
@@ -155,14 +151,6 @@ if( CMAKE_COMPILER_IS_GNUCXX ) 


endif( CMAKE_COMPILER_IS_GNUCXX )



if( wxUSE_UNICODE )

    add_definitions( -DwxUSE_UNICODE )

endif()



if( KICAD_GOST )

    add_definitions( -DKICAD_GOST )

endif()



if( KICAD_KEEPCASE )

    add_definitions( -DKICAD_KEEPCASE )

endif()

CMakeModules/CreateBzrVersionHeader.cmake

+1 −5
Original line number Diff line number Diff line
@@ -56,11 +56,7 @@ macro( create_bzr_version_header ) 
    if( Kicad_REPO_LAST_CHANGED_DATE )

        string( REGEX REPLACE "^([0-9]+)\\-([0-9]+)\\-([0-9]+)" "\\1-\\2-\\3"

                _kicad_bzr_date ${Kicad_REPO_LAST_CHANGED_DATE} )

        if( KICAD_GOST )

        	set( KICAD_BUILD_VERSION "(${_kicad_bzr_date} BZR ${Kicad_REPO_REVISION} GOST)" )

        else( KICAD_GOST )

      	set( KICAD_BUILD_VERSION "(${_kicad_bzr_date} BZR ${Kicad_REPO_REVISION})" )

        endif( KICAD_GOST )



        # Definition to conditionally use date and revision returned from the

        # Bazaar log command instead of hand coded date and revision in

Documentation/compiling/build-config.txt

+0 −5
Original line number Diff line number Diff line
@@ -111,11 +111,6 @@ This option is used to enable or disable building KiCad with images in menu 
items.  If this is not defined when CMake is used to create the build files,

images will be included in menu items on all platforms except OSX.



KICAD_GOST (ON/OFF)

-------------------

This option is used to enable or disable the GOST notation for multiple gates

per package in Eeschema.  The default is  OFF



KICAD_KEEPCASE (ON/OFF)

-----------------------

This option enables or disables turning off the  automatic component name

INSTALL.txt

+8 −10
Original line number Diff line number Diff line
@@ -131,10 +131,14 @@ Installation from source code 
Some dependencies must be satisfied for the correct installation of KiCad:

under Linux:

wxWidgets           >= 2.8.11        http://www.wxwidgets.org/

(needs to be compiled with unicode support)

under Windows:MacOSX

wxWidgets           >= 2.9.3        http://www.wxwidgets.org/

CMake               >= 2.6.4         http://www.cmake.org/

Boost C++ Libraries  (files used by kicad are provided in kicad sources) http://www.boost.org/

wxWidgets           >= 2.9.4        http://www.wxwidgets.org/



CMake               >= 2.8.1         http://www.cmake.org/

Boost C++ Libraries:

    files used by kicad are autmatically downloaded and patched if needed

    from boost site ( http://www.boost.org/ )

OpenGL

  Linux:   Mesa 3D Graphics Library  http://www.mesa3d.org/

  Windows: built-in
@@ -186,12 +190,6 @@ configured and builded with "--enable-monolithic --disable-shared" parameters. 
For building dinamically linked executables. Can be used only if wxWidgets

configured and builded with "--disable-monolithic --enable-shared" parameters.



-DwxUSE_UNICODE=ON

Require on locale utf8 for build the KiCad with cyrillic fonts support.



-DKICAD_GOST=ON

Build the KiCad with russian GOST support.



-DKICAD_KEEPCASE=ON

Build the KiCad with no component name conversion to uppercase (if you want your

ADuC.../Si.../bq... components named as just so).

common/dialogs/dialog_page_settings.cpp

+5 −2
Original line number Diff line number Diff line
@@ -258,12 +258,15 @@ void DIALOG_PAGES_SETTINGS::OnPaperSizeChoice( wxCommandEvent& event ) 
    {

        m_orientationComboBox->Enable( true );



        if( paperType.Contains( wxT( "A4" ) ) && IsGOST() )

#if 0

        // ForcePortrait() does not exist, but could be useful.

        // so I leave these lines, which could be seen as a todo feature

        if( paperType.ForcePortrait() )

        {

            m_orientationComboBox->SetStringSelection( _( "Portrait" ) );

            m_orientationComboBox->Enable( false );

        }



#endif

        m_TextUserSizeX->Enable( false );

        m_TextUserSizeY->Enable( false );

        m_customFmt = false;