remove useless USE_BOOST_POLYGON_LIBRARY cmake option, and remove unused files. (4cbcf56c) · Commits · Elphel / kicad-source-mirror

CMakeLists.txt

+0 −9

Original line number	Original line	Diff line number	Diff line
	@@ -35,10 +35,6 @@ option(USE_WX_GRAPHICS_CONTEXT
	option(USE_WX_OVERLAY		option(USE_WX_OVERLAY
	"Use wxOverlay: Always ON for MAC (default OFF). Warning, this is experimental")		"Use wxOverlay: Always ON for MAC (default OFF). Warning, this is experimental")

	option(USE_BOOST_POLYGON_LIBRARY
	"Use boost polygon library instead of Kbool to calculate filled areas in zones (default ON)."
	ON )

	#One of these 2 option must be set to ON:		#One of these 2 option must be set to ON:
	option(KICAD_STABLE_VERSION		option(KICAD_STABLE_VERSION
	"set this option to ON to build the stable version of KICAD. mainly used to set version ID (default OFF)"		"set this option to ON to build the stable version of KICAD. mainly used to set version ID (default OFF)"
	@@ -112,11 +108,6 @@ if(USE_WX_GRAPHICS_CONTEXT)
	add_definitions(-DUSE_WX_GRAPHICS_CONTEXT)		add_definitions(-DUSE_WX_GRAPHICS_CONTEXT)
	endif(USE_WX_GRAPHICS_CONTEXT)		endif(USE_WX_GRAPHICS_CONTEXT)

	if(USE_BOOST_POLYGON_LIBRARY)
	set( USE_BOOST_POLYGON_LIBRARY ON )
	add_definitions(-DUSE_BOOST_POLYGON_LIBRARY)
	endif(USE_BOOST_POLYGON_LIBRARY)

	# Allow user to override the default settings for adding images to menu items. By default		# Allow user to override the default settings for adding images to menu items. By default
	# images in menu items are enabled on all plaforms except OSX. This can be over ridden by		# images in menu items are enabled on all plaforms except OSX. This can be over ridden by
	# defining -DUSE_IMAGES_IN_MENUS=ON/OFF to force the preferred behavior.		# defining -DUSE_IMAGES_IN_MENUS=ON/OFF to force the preferred behavior.

bitmap2component/bitmap2cmp_gui.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -333,7 +333,7 @@ void BM2CMP_FRAME::OnExportPcbnew( wxCommandEvent& event )
	if( path.IsEmpty() \|\| !wxDirExists(path) )		if( path.IsEmpty() \|\| !wxDirExists(path) )
	path = ::wxGetCwd();		path = ::wxGetCwd();

	wxString msg = _( "Footprint file (.mod)\|.mod" );		wxString msg = _( "Footprint file (.mod;.emp)\|.mod;.emp" );
	wxFileDialog FileDlg( this, _( "Create a footprint file for PcbNew" ),		wxFileDialog FileDlg( this, _( "Create a footprint file for PcbNew" ),
	path, wxEmptyString,		path, wxEmptyString,
	msg,		msg,

common/basicframe.cpp

+1 −6

Original line number	Original line	Diff line number	Diff line
	@@ -532,12 +532,7 @@ void EDA_BASE_FRAME::CopyVersionInfoToClipboard( wxCommandEvent& event )
	tmp << wxT( "OFF\n" );		tmp << wxT( "OFF\n" );
	#endif		#endif

	tmp << wxT( " USE_BOOST_POLYGON_LIBRARY=" );		tmp << wxT( " USE_BOOST_POLYGON_LIBRARY" );
	#ifdef USE_BOOST_POLYGON_LIBRARY
	tmp << wxT( "ON\n" );
	#else
	tmp << wxT( "OFF\n" );
	#endif

	wxTheClipboard->SetData( new wxTextDataObject( tmp ) );		wxTheClipboard->SetData( new wxTextDataObject( tmp ) );
	wxTheClipboard->Close();		wxTheClipboard->Close();

pcbnew/CMakeLists.txt

+1 −10

Original line number	Original line	Diff line number	Diff line
	@@ -13,14 +13,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
	###		###
	# Sources		# Sources
	#		#
	# NOTE: Many of the commented out ones are nested in *.cpp files for dialogs
	###
	if( USE_BOOST_POLYGON_LIBRARY )
	set(PCBNEW_SRC_FILL_ZONE zones_convert_brd_items_to_polygons_with_Boost.cpp)
	else( USE_BOOST_POLYGON_LIBRARY )
	set(PCBNEW_SRC_FILL_ZONE zones_convert_brd_items_to_polygons_with_Kbool.cpp)
	endif( USE_BOOST_POLYGON_LIBRARY )

	set(PCBNEW_DIALOGS		set(PCBNEW_DIALOGS
	dialogs/dialog_block_options_base.cpp		dialogs/dialog_block_options_base.cpp
	dialogs/dialog_cleaning_options_base.cpp		dialogs/dialog_cleaning_options_base.cpp
	@@ -100,7 +92,6 @@ set(PCBNEW_SRCS
	controle.cpp		controle.cpp
	dimension.cpp		dimension.cpp
	cross-probing.cpp		cross-probing.cpp
	debug_kbool_key_file_fct.cpp
	deltrack.cpp		deltrack.cpp
	${PCBNEW_DIALOGS}		${PCBNEW_DIALOGS}
	dist.cpp		dist.cpp
	@@ -185,7 +176,7 @@ set(PCBNEW_SRCS
	trpiste.cpp		trpiste.cpp
	work.cpp		work.cpp
	xchgmod.cpp		xchgmod.cpp
	${PCBNEW_SRC_FILL_ZONE}		zones_convert_brd_items_to_polygons_with_Boost.cpp
	zones_convert_to_polygons_aux_functions.cpp		zones_convert_to_polygons_aux_functions.cpp
	zones_by_polygon.cpp		zones_by_polygon.cpp
	zones_by_polygon_fill_functions.cpp		zones_by_polygon_fill_functions.cpp

pcbnew/board_items_to_polygon_shape_transform.cpp

+1 −7

Original line number	Original line	Diff line number	Diff line
	@@ -659,13 +659,7 @@ void CreateThermalReliefPadPolygon( std::vector<CPolyPt>& aCornerBuffer,
	corners_buffer.push_back( corner );		corners_buffer.push_back( corner );

	// Now, add the 4 holes ( each is the pattern, rotated by 0, 90, 180 and 270 deg		// Now, add the 4 holes ( each is the pattern, rotated by 0, 90, 180 and 270 deg
	// WARNING: problems with kbool if angle = 0 (in fact when angle < 200):		// aThermalRot = 450 (45.0 degrees orientation) work fine.
	// bad filled polygon on some cases, when pads are on a same vertical line
	// this seems a bug in kbool polygon (exists in 2.0 kbool version)
	// aThermalRot = 450 (45.0 degrees orientation) seems work fine.
	// aThermalRot = 0 with thermal shapes without angle < 90 deg has problems in rare
	// circumstances.
	// Note: with the 2 step build ( thermal shapes added after areas are built), 0 seems work
	int angle_pad = aPad.m_Orient; // Pad orientation		int angle_pad = aPad.m_Orient; // Pad orientation
	int th_angle = aThermalRot;		int th_angle = aThermalRot;

Admin message