downloads-by-cmake now configurable, fix wx2.8 compiler errors (0f1f0f92) · Commits · Elphel / kicad-source-mirror

CMakeLists.txt

+12 −4

Original line number	Original line	Diff line number	Diff line
	@@ -74,6 +74,13 @@ else()
	message("Build testing (unstable) version of KiCad")		message("Build testing (unstable) version of KiCad")
	endif()		endif()

			# All CMake downloads go here. Suggested is up in the source tree, not in the build dir where they
			# would have to be downloaded over and over again. The default is to choose a directory that is
			# hidden on linux (starts with a '.') because there is a way to exclude this directory when grepping
			# the source tree.
			set( DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}/.downloads-by-cmake
			CACHE PATH "Location of KiCad downloads, suggested is a dir common to all builds, i.e. global." )


	#================================================		#================================================
	# Set flags for GCC.		# Set flags for GCC.
	@@ -149,6 +156,11 @@ if(CMAKE_COMPILER_IS_GNUCXX)
	set(CMAKE_CXX_FLAGS_DEBUG "${KICAD_GCC_DEBUG_BUILD_FLAGS} -Wall -g3 -ggdb3 -DDEBUG")		set(CMAKE_CXX_FLAGS_DEBUG "${KICAD_GCC_DEBUG_BUILD_FLAGS} -Wall -g3 -ggdb3 -DDEBUG")
	endif()		endif()

			# quiet GCC 4.8.1 while in boost
			if( GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8 )
			set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-local-typedefs" )
			endif()

	endif(CMAKE_COMPILER_IS_GNUCXX)		endif(CMAKE_COMPILER_IS_GNUCXX)

	if(wxUSE_UNICODE)		if(wxUSE_UNICODE)
	@@ -239,10 +251,6 @@ include(Functions)

	include( ExternalProject )		include( ExternalProject )

	# All CMake downloads go here, up in the source tree, not in the build dir where they
	# would have to be downloaded over and over again.
	set( DOWNLOAD_DIR ${PROJECT_SOURCE_DIR}/downloads-by-cmake )

	#================================================		#================================================
	# Find libraries that are needed to build KiCad.		# Find libraries that are needed to build KiCad.
	#================================================		#================================================

common/page_layout_default_description.cpp

+6 −3

Original line number	Original line	Diff line number	Diff line
	@@ -106,16 +106,18 @@
	*		*
	*/		*/

			#include <worksheet.h> // defaultPageLayout


	// height of the band reference grid 2.0 mm		// height of the band reference grid 2.0 mm
	// worksheet frame reference text size 1.3 mm		// worksheet frame reference text size 1.3 mm
	// default text size 1.5 mm		// default text size 1.5 mm
	// default line width 0.15 mm		// default line width 0.15 mm
	// frame ref pitch 50 mm		// frame ref pitch 50 mm

	extern const wxString defaultPageLayout;

	// Default page layout (sizes are in mm)		// Default page layout (sizes are in mm)
	const wxString defaultPageLayout( wxT( "( page_layout\n"		const char defaultPageLayout[] = "( page_layout\n"
	"(setup (textsize 1.5 1.5) (linewidth 0.15) (textlinewidth 0.15) )"		"(setup (textsize 1.5 1.5) (linewidth 0.15) (textlinewidth 0.15) )"
	"(rect (comment rect around the title block) (linewidth 0.15) (start 110 34) (end 2 2) )\n"		"(rect (comment rect around the title block) (linewidth 0.15) (start 110 34) (end 2 2) )\n"
	"(rect (start 0 0 ltcorner) (end 0 0 rbcorner) (repeat 2) (incrx 2) (incry 2) )\n"		"(rect (start 0 0 ltcorner) (end 0 0 rbcorner) (repeat 2) (incrx 2) (incry 2) )\n"
	@@ -146,4 +148,5 @@ const wxString defaultPageLayout( wxT( "( page_layout\n"
	"(tbtext \"%C3\" (comment Comment 0) (pos 108 32) )\n"		"(tbtext \"%C3\" (comment Comment 0) (pos 108 32) )\n"
	"(line (start 90 8.5) end 90 5.5) )\n"		"(line (start 90 8.5) end 90 5.5) )\n"
	"(line (start 26 8.5) end 26 2) )\n"		"(line (start 26 8.5) end 26 2) )\n"
	")\n" ) );		")\n"
			;

common/page_layout_reader.cpp

+1 −5

Original line number	Original line	Diff line number	Diff line
	@@ -36,10 +36,6 @@
	#include <vector2d.h>		#include <vector2d.h>
	#include <page_layout_reader_lexer.h>		#include <page_layout_reader_lexer.h>

	// defaultPageLayout is the default page layout description
	// using the S expr.
	// see page_layout_default_shape.cpp
	extern const wxString defaultPageLayout;

	using namespace TB_READER_T;		using namespace TB_READER_T;

	@@ -448,7 +444,7 @@ double PAGE_LAYOUT_READER_PARSER::parseDouble()

	void WORKSHEET_LAYOUT::SetDefaultLayout()		void WORKSHEET_LAYOUT::SetDefaultLayout()
	{		{
	PAGE_LAYOUT_READER_PARSER lp_parser( defaultPageLayout, "default page" );		PAGE_LAYOUT_READER_PARSER lp_parser( defaultPageLayout, wxT( "default page" ) );

	try		try
	{		{

include/worksheet.h

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -47,4 +47,9 @@ void DrawPageLayout( wxDC* aDC, EDA_DRAW_PANEL * aCanvas,
	int aPenWidth, double aScalar,		int aPenWidth, double aScalar,
	EDA_COLOR_T aLineColor, EDA_COLOR_T aTextColor );		EDA_COLOR_T aLineColor, EDA_COLOR_T aTextColor );

			// defaultPageLayout is the default page layout description
			// using the S expr.
			// see page_layout_default_shape.cpp
			extern const char defaultPageLayout[];

	#endif // WORKSHEET_H_		#endif // WORKSHEET_H_

pcbnew/CMakeLists.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -97,6 +97,7 @@ set(PCBNEW_DIALOGS
	dialogs/dialog_mask_clearance_base.cpp		dialogs/dialog_mask_clearance_base.cpp
	dialogs/dialog_SVG_print.cpp		dialogs/dialog_SVG_print.cpp
	dialogs/dialog_SVG_print_base.cpp		dialogs/dialog_SVG_print_base.cpp
			dialogs/dialog_set_grid.cpp
	dialogs/dialog_set_grid_base.cpp		dialogs/dialog_set_grid_base.cpp
	footprint_wizard.cpp		footprint_wizard.cpp
	footprint_wizard_frame.cpp		footprint_wizard_frame.cpp
	@@ -192,7 +193,6 @@ set(PCBNEW_CLASS_SRCS
	print_board_functions.cpp		print_board_functions.cpp
	printout_controler.cpp		printout_controler.cpp
	ratsnest.cpp		ratsnest.cpp
	set_grid.cpp
	specctra.cpp		specctra.cpp
	specctra_export.cpp		specctra_export.cpp
	specctra_import.cpp		specctra_import.cpp

Admin message