Upstream merge. (36f1147d) · Commits · Elphel / kicad-source-mirror

.bzrignore

+3 −1

Original line number	Diff line number	Diff line
		include/boost
		downloads-by-cmake
		.downloads-by-cmake
		common/netlist_keywords.*
		common/netlist_lexer.h
		common/pcb_plot_params_lexer.h
		common/page_layout_reader_keywords.cpp
		common/fp_lib_table_keywords.*
		include/fp_lib_table_lexer.h
		include/netlist_lexer.h
		include/page_layout_reader_lexer.h
		eeschema/cmp_library_lexer.h
		eeschema/cmp_library_keywords.*
		eeschema/template_fieldnames_keywords.*

CMakeLists.txt

+12 −4

Original line number	Diff line number	Diff line
		@@ -74,6 +74,13 @@ else()
		message("Build testing (unstable) version of KiCad")
		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.
		@@ -149,6 +156,11 @@ if(CMAKE_COMPILER_IS_GNUCXX)
		set(CMAKE_CXX_FLAGS_DEBUG "${KICAD_GCC_DEBUG_BUILD_FLAGS} -Wall -g3 -ggdb3 -DDEBUG")
		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)

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

		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.
		#================================================

CMakeModules/Html2C.cmake

+2 −1

Original line number	Diff line number	Diff line
		@@ -8,5 +8,6 @@ file( STRINGS ${inputFile} lines )
		file( WRITE ${outputFile} "// Do not edit this file, it is autogenerated by CMake from an HTML file\n" )

		foreach( line ${lines} )
		file( APPEND ${outputFile} "\"" ${line} "\"\n" )
		STRING(REGEX REPLACE "\"" "\\\\\"" linem ${line})
		file( APPEND ${outputFile} "\"" ${linem} "\\n\"\n" )
		endforeach( line ${lines} )

CMakeModules/cmake_uninstall.cmake.in

+21 −20

Original line number	Diff line number	Diff line
		IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
		MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
		ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
		if( NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" )
		message( FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"" )
		endif()

		FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
		STRING(REGEX REPLACE "\n" ";" files "${files}")
		FOREACH(file ${files})
		MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
		IF(EXISTS "$ENV{DESTDIR}${file}")
		file( READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files )
		string( REGEX REPLACE "\n" ";" files "${files}" )

		foreach( file ${files} )
		message( STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"" )
		if( EXISTS "$ENV{DESTDIR}${file}" )
		EXEC_PROGRAM(
		"@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
		OUTPUT_VARIABLE rm_out
		RETURN_VALUE rm_retval
		)
		IF(NOT "${rm_retval}" STREQUAL 0)
		MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
		ENDIF(NOT "${rm_retval}" STREQUAL 0)
		ELSE(EXISTS "$ENV{DESTDIR}${file}")
		MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
		ENDIF(EXISTS "$ENV{DESTDIR}${file}")
		ENDFOREACH(file)
		if( NOT "${rm_retval}" STREQUAL 0 )
		message( FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"" )
		endif()
		else()
		message( STATUS "File \"$ENV{DESTDIR}${file}\" does not exist." )
		endif()
		endforeach()

Documentation/compiling/COMPILING.txt

+12 −6

Original line number	Diff line number	Diff line
		@@ -28,16 +28,22 @@ development libaries.
		After a fresh install you need the following packages to compile and run
		KiCad from source.

		CMake - Cross-platform make
		GLUT - The OpenGL Utility Library
		wxGTK or wxWidgets - The wxWidgets GUI toolkit with GTK+ bindings
		* bzr - Bazaar version control system
		* CMake - Cross-platform make
		* GLUT - The OpenGL Utility Library
		* wxGTK or wxWidgets - The wxWidgets GUI toolkit with GTK+ bindings

		Boost - Collection of portable C++ source libraries
		Because boost is in the repository of kicad you don't need to install them.
		* Boost - Collection of portable C++ source libraries
		boost will be automagically downloaded and copied in kicad sources tree,
		the first time you compile kicad.

		Useful, but not required:
		Doxygen - Documentation system for several programming languages
		* Doxygen - Documentation system for several programming languages

		KiCad uses the Bazaar version control system to track source code changes,
		and download the boost libraries needed by Kicad.
		Be sure you bzr install also includes bzrtools.
		boost libraries will be downloaded the first time you build Kicad.

		Compiler and basic development tools
		-------------

Admin message