merge Orson's patch with changes (e9d3f787) · Commits · Elphel / kicad-source-mirror

CMakeLists.txt

+24 −14

Original line number	Original line	Diff line number	Diff line
	@@ -23,11 +23,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" )

	#One of these 2 option must be set to ON:
	option( KICAD_STABLE_VERSION
	"set this option to ON to build the stable version of KICAD. mainly used to set version ID (default OFF)"
	)

	option( KICAD_SCRIPTING		option( KICAD_SCRIPTING
	"set this option ON to build the scripting support inside kicad binaries"		"set this option ON to build the scripting support inside kicad binaries"
	)		)
	@@ -44,22 +39,23 @@ option( KICAD_BUILD_STATIC
	"Builds Kicad and all libraries static (except wx-widgets)"		"Builds Kicad and all libraries static (except wx-widgets)"
	)		)

			# WARNING: KiCad developers strongly advise you to build Boost with supplied patches,
			# as it is known to work with KiCad. Other versions may contain bugs that may result
			# in KiCad errors.
			option( KICAD_SKIP_BOOST
			"Skip building downloaded Boost library components, use Boost from your system."
			)
			mark_as_advanced( KICAD_SKIP_BOOST ) # Normal builders should build Boost.


	# when option KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES is enabled:		# when option KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES is enabled:
	# PYTHON_EXECUTABLE can be defined when invoking cmake		# PYTHON_EXECUTABLE can be defined when invoking cmake
	# ( use -DPYTHON_EXECUTABLE=<python path>/python.exe or python2 )		# ( use -DPYTHON_EXECUTABLE=<python path>/python.exe or python2 )
	# when not defined by user, the default is python.exe under Windows and python2 for others		# when not defined by user, the default is python.exe under Windows and python2 for others
	# python binary file should be is exec path.		# python binary file should be is exec path.


	option( BUILD_GITHUB_PLUGIN "Build the GITHUB_PLUGIN for pcbnew." OFF )		option( BUILD_GITHUB_PLUGIN "Build the GITHUB_PLUGIN for pcbnew." OFF )


	# Set version option (stable or testing)
	if( KICAD_STABLE_VERSION)
	add_definitions( -DKICAD_STABLE_VERSION )
	message( STATUS "Building stable version of KiCad" )
	endif()

	# All CMake downloads go here. Suggested is up in the source tree, not in the build dir where they		# 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		# 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		# hidden on linux (starts with a '.') because there is a way to exclude this directory when grepping
	@@ -317,7 +313,21 @@ check_find_package_result(CAIRO_FOUND "Cairo")

	# Download boost and possibly build parts of it		# Download boost and possibly build parts of it
	#################################################		#################################################
			if( KICAD_SKIP_BOOST )
			find_package( Boost 1.54.0 REQUIRED COMPONENTS context date_time filesystem iostreams locale
			program_options regex system thread )

			if( NOT Boost_FOUND )
			message( FATAL_ERROR "Boost 1.54+ libraries are required." )
			endif()

			message( WARNING "
			WARNING: You decided to skip building boost library.
			KiCad developers strongly advise you to build the bundled boost library, as it is known to work with KiCad.
			Other versions may contain bugs that may result in KiCad errors." )
			else()
	include( download_boost )		include( download_boost )
			endif()

	##########################		##########################
	# Find wxWidgets library #		# Find wxWidgets library #

Documentation/compiling/COMPILING.txt

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -134,7 +134,7 @@ On either cmake command line shown below, you can optionally include
	-DCMAKE_INSTALL_PREFIX=<finallInstallDir>		-DCMAKE_INSTALL_PREFIX=<finallInstallDir>

	If windows, run the following command:		If windows, run the following command:
	cmake -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -DKICAD_TESTING_VERSION=ON -DwxWidgets_ROOT_DIR=<wxInstallDir> ../../		cmake -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Release -DwxWidgets_ROOT_DIR=<wxInstallDir> ../../

	If linux, run instead the following command:		If linux, run instead the following command:
	cmake -DCMAKE_BUILD_TYPE=Release ../../		cmake -DCMAKE_BUILD_TYPE=Release ../../
	@@ -167,7 +167,7 @@ Although normally you do not install the Debug binaries, you can debug them
	where they were built.		where they were built.

	If windows, run the following command:		If windows, run the following command:
	cmake -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Debug -DKICAD_TESTING_VERSION=ON -DwxWidgets_ROOT_DIR=<wxInstallDir> ../../		cmake -G "MSYS Makefiles" -DCMAKE_BUILD_TYPE=Debug -DwxWidgets_ROOT_DIR=<wxInstallDir> ../../
	where <wxInstallDir> is <wxWidgets path>/Release		where <wxInstallDir> is <wxWidgets path>/Release

	If linux, run instead the following command:		If linux, run instead the following command:

Documentation/compiling/build-config.txt

+5 −9

Original line number	Original line	Diff line number	Diff line
	@@ -88,15 +88,11 @@ All of the configuration settings below are specific to the KiCad project.
	If for any reason you add or remove a build option to the KiCad CMake files,		If for any reason you add or remove a build option to the KiCad CMake files,
	please update the list below.		please update the list below.

	KICAD_STABLE_VERSION (ON/OFF)		KICAD_SKIP_BOOST (ON/OFF)
	-----------------------------		--------------------------
	This option enables or disables the stable version string to be created and		Skips building the required boost library components.
	used when building KiCad. It is mutually exclusive with KICAD_TESTING_VERSION.		WARNING: KiCad developers strongly advise you to build the bundled boost library, as it is
			known to work with KiCad. Other versions may contain bugs that may result in KiCad errors.
	KICAD_TESTING_VERSION (ON/OFF)
	------------------------------
	This option enables or disables the testing version string to be created and
	used when building KiCad. It is mutually exclusive with KICAD_STABLE_VERSION.

	USE_WX_GRAPHICS_CONTEXT (ON/OFF)		USE_WX_GRAPHICS_CONTEXT (ON/OFF)
	--------------------------------		--------------------------------

Documentation/compiling/build-msw.txt

+3 −6

Original line number	Original line	Diff line number	Diff line
	@@ -149,8 +149,7 @@ command line enter the following commands:
	To create a release build of KiCad, run the following command:		To create a release build of KiCad, run the following command:
	#cd build		#cd build
	#cmake -G "MSYS Makefiles" \ # Back slashes are not required		#cmake -G "MSYS Makefiles" \ # Back slashes are not required
	-DCMAKE_BUILD_TYPE=Release \ # and are for formatting only.		-DCMAKE_BUILD_TYPE=Release ../../ \ # and are for formatting only.
	-DKICAD_TESTING_VERSION=ON ../../

	If the configuration fails, you have failed to install the required software		If the configuration fails, you have failed to install the required software
	on you system. The error message should give you a good indication of what is		on you system. The error message should give you a good indication of what is
	@@ -187,8 +186,7 @@ To create a debug version of KiCad, enter the following commands:

	#cd <kicadSource>/build/debug		#cd <kicadSource>/build/debug
	#cmake -G "MSYS Makefiles" \		#cmake -G "MSYS Makefiles" \
	-DCMAKE_BUILD_TYPE=Debug \		-DCMAKE_BUILD_TYPE=Debug ../../
	-DKICAD_TESTING_VERSION=ON ../../
	#make		#make

	Generally speaking you do not install debug binaries. They can be debugged in		Generally speaking you do not install debug binaries. They can be debugged in
	@@ -209,8 +207,7 @@ compile the source as described above.
	#cmake -G "MSYS Makefiles" \		#cmake -G "MSYS Makefiles" \
	-DCMAKE_BUILD_TYPE=Release \		-DCMAKE_BUILD_TYPE=Release \
	-DKICAD_PYTHON_SCRIPTING=ON \		-DKICAD_PYTHON_SCRIPTING=ON \
	-DKICAD_PYTHON_MODULES=ON \		-DKICAD_PYTHON_MODULES=ON ../../
	-DKICAD_TESTING_VERSION=ON ../../

	You only need to include the KICAD_PYTHON_MODULES option if you want to		You only need to include the KICAD_PYTHON_MODULES option if you want to
	install the python modules that ship with KiCad. Also note that the wxPython		install the python modules that ship with KiCad. Also note that the wxPython

Documentation/compiling/mac-osx.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -115,7 +115,7 @@ user@mac-osx$ make

	It is also possible to give all the options on the commandline and not to edit the CMakeCache.txt. This is a oneliner for Leopard and up:		It is also possible to give all the options on the commandline and not to edit the CMakeCache.txt. This is a oneliner for Leopard and up:

	cmake ~/Repositories/testing -DKICAD_TESTING_VERSION=ON -DCMAKE_OSX_ARCHITECTURES="i386 -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6" -DCMAKE_CXX_FLAGS="-D__ASSERTMACROS__" -DCMAKE_OSX_SYSROOT="/Developer/SDKs/MacOSX10.6.sdk"		cmake ~/Repositories/testing -DCMAKE_OSX_ARCHITECTURES="i386 -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6" -DCMAKE_CXX_FLAGS="-D__ASSERTMACROS__" -DCMAKE_OSX_SYSROOT="/Developer/SDKs/MacOSX10.6.sdk"

	Optional compiler cache		Optional compiler cache
	~~~~~~~~~~~~~~~~~~~~~~~		~~~~~~~~~~~~~~~~~~~~~~~