Commit 3f8343b3 authored by Carl Poirier's avatar Carl Poirier Committed by Dick Hollenbeck
Browse files

REMOVE: USE_PCBNEW_NANOMETERS by making it the only way to go in pcbnew,... 

REMOVE: USE_PCBNEW_NANOMETERS by making it the only way to go in pcbnew, effectively removing the deci-mils build.
parent 4c6f7bc1

CMakeLists.txt

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

#



option(USE_PCBNEW_NANOMETRES

    "Use nanometers for Pcbnew internal units instead of deci-mils (default ON)." ON)



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

CMakeModules/config.h.cmake

+1 −8
Original line number Diff line number Diff line
@@ -75,15 +75,8 @@ 


#cmakedefine USE_IMAGES_IN_MENUS 1



/// Definitions to enable the s-expression file formats and nanometer units.

#cmakedefine USE_PCBNEW_NANOMETRES



/// The legacy file format revision of the *.brd file created by this build

#if defined(USE_PCBNEW_NANOMETRES)

#define LEGACY_BOARD_FILE_VERSION 2

#else

#define LEGACY_BOARD_FILE_VERSION          1

#endif



/// Definition to compile with Pcbnew footprint library table implementation.

#cmakedefine USE_FP_LIB_TABLE

Documentation/compiling/build-config.txt

+0 −4
Original line number Diff line number Diff line
@@ -111,10 +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.



USE_PCBNEW_NANOMETRES (ON/OFF)

This option is used to enable or disable the nano-meter internal units for

Pcbnew.  The default is ON.



KICAD_GOST (ON/OFF)

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

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

HOW_TO_CONTRIBUTE.txt

+2 −2
Original line number Diff line number Diff line
@@ -25,10 +25,10 @@ Contribute to KiCad (under Linux) 
6) Compile:

    cd kicad_john

    mkdir build; cd build

    cmake ../ -DKICAD_TESTING_VERSION=ON -DCMAKE_BUILD_TYPE=Debug

    cmake ../ -DCMAKE_BUILD_TYPE=Debug

    to build a debug version

    or

    cmake ../ -DKICAD_TESTING_VERSION=ON -DCMAKE_BUILD_TYPE=Release

    cmake ../ -DCMAKE_BUILD_TYPE=Release

    to build a release version

    make

common/basicframe.cpp

+0 −7
Original line number Diff line number Diff line
@@ -502,13 +502,6 @@ void EDA_BASE_FRAME::CopyVersionInfoToClipboard( wxCommandEvent& event ) 
    tmp << wxT( "Boost version: " ) << ( BOOST_VERSION / 100000 ) << wxT( "." )

        << ( BOOST_VERSION / 100 % 1000 ) << wxT( "." ) << ( BOOST_VERSION % 100 ) << wxT( "\n" );



    tmp << wxT( "Options: USE_PCBNEW_NANOMETRES=" );

#ifdef USE_PCBNEW_NANOMETRES

    tmp << wxT( "ON\n" );

#else

    tmp << wxT( "OFF\n" );

#endif



    tmp << wxT( "         USE_WX_GRAPHICS_CONTEXT=" );

#ifdef USE_WX_GRAPHICS_CONTEXT

    tmp << wxT( "ON\n" );