[MacOSX] Fixing build system, sorry guys, refining build system and make building smoother. (2acaa287) · Commits · Elphel / kicad-source-mirror

CMakeLists.txt

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -341,7 +341,9 @@ add_definitions(-DWX_COMPATIBILITY)
	find_package( OpenGL QUIET )		find_package( OpenGL QUIET )
	check_find_package_result( OPENGL_FOUND "OpenGL" )		check_find_package_result( OPENGL_FOUND "OpenGL" )

	if( KICAD_SCRIPTING_WXPYTHON )
			if( KICAD_BUILD_STATIC OR KICAD_BUILD_DYNAMIC )

	add_custom_target( lib-wxpython )		add_custom_target( lib-wxpython )
	include( download_pcre )		include( download_pcre )
	include( download_swig )		include( download_swig )
	@@ -349,9 +351,7 @@ add_custom_target( lib-wxpython )
	add_dependencies( lib-wxpython pcre )		add_dependencies( lib-wxpython pcre )
	add_dependencies( lib-wxpython swig )		add_dependencies( lib-wxpython swig )
	add_dependencies( lib-wxpython libwxpython )		add_dependencies( lib-wxpython libwxpython )
	endif()

	if( KICAD_BUILD_STATIC OR KICAD_BUILD_DYNAMIC )

	#set(CMAKE_FIND_LIBRARY_SUFFIXES ".a;.so;.dylib;.dll")		#set(CMAKE_FIND_LIBRARY_SUFFIXES ".a;.so;.dylib;.dll")

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -42,8 +42,10 @@ if (APPLE)
	set( SWIG_CFLAGS "CFLAGS=-arch ${CMAKE_OSX_ARCHITECTURES} -mmacosx-version-min=10.5" )		set( SWIG_CFLAGS "CFLAGS=-arch ${CMAKE_OSX_ARCHITECTURES} -mmacosx-version-min=10.5" )
	set( SWIG_CXXFLAGS "CXXFLAGS=-arch ${CMAKE_OSX_ARCHITECTURES} -mmacosx-version-min=10.5" )		set( SWIG_CXXFLAGS "CXXFLAGS=-arch ${CMAKE_OSX_ARCHITECTURES} -mmacosx-version-min=10.5" )
	set( SWIG_LDFLAGS "LDFLAGS=-arch ${CMAKE_OSX_ARCHITECTURES} -mmacosx-version-min=10.5" )		set( SWIG_LDFLAGS "LDFLAGS=-arch ${CMAKE_OSX_ARCHITECTURES} -mmacosx-version-min=10.5" )
	set( SWIG_PYTHON "--with-python=/usr/bin/python2.6" )
	endif( CMAKE_OSX_ARCHITECTURES )		endif( CMAKE_OSX_ARCHITECTURES )

			set( SWIG_PYTHON "--with-python=/usr/bin/python2.6" )
			set( SWIG_OPTS --disable-dependency-tracking )
	endif(APPLE)		endif(APPLE)

	# <SOURCE_DIR> = ${PREFIX}/src/glew		# <SOURCE_DIR> = ${PREFIX}/src/glew
	@@ -66,7 +68,7 @@ ExternalProject_Add( swig
	UPDATE_COMMAND ${CMAKE_COMMAND} -E remove_directory "${SWIG_ROOT}"		UPDATE_COMMAND ${CMAKE_COMMAND} -E remove_directory "${SWIG_ROOT}"

	#PATCH_COMMAND "true"		#PATCH_COMMAND "true"
	CONFIGURE_COMMAND ./configure --prefix=${SWIG_ROOT} --with-pcre-prefix=${PCRE_ROOT} ${SWIG_CFLAGS} ${SWIG_LDFLAGS} ${SWIG_CXXFLAGS} ${SWIG_PYTHON}		CONFIGURE_COMMAND ./configure --prefix=${SWIG_ROOT} --with-pcre-prefix=${PCRE_ROOT} ${SWIG_CFLAGS} ${SWIG_LDFLAGS} ${SWIG_CXXFLAGS} ${SWIG_PYTHON} ${SWIG_OPTS}

	#BINARY_DIR "${PREFIX}"		#BINARY_DIR "${PREFIX}"

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -74,7 +74,7 @@ ExternalProject_Add( libwxpython
	UPDATE_COMMAND ${CMAKE_COMMAND} -E remove_directory "${LIBWXPYTHON_ROOT}"		UPDATE_COMMAND ${CMAKE_COMMAND} -E remove_directory "${LIBWXPYTHON_ROOT}"
	COMMAND ${LIBWXPYTHON_EXEC} wxPython/build-wxpython.py --clean		COMMAND ${LIBWXPYTHON_EXEC} wxPython/build-wxpython.py --clean

	CONFIGURE_COMMAND ${LIBWXPYTHON_EXEC} wxPython/build-wxpython.py --prefix=/Users/marco/Development/product/libwxpython_root --unicode --install ${LIBWXPYTHON_OPTS}		CONFIGURE_COMMAND ${LIBWXPYTHON_EXEC} wxPython/build-wxpython.py --prefix=${LIBWXPYTHON_ROOT} --unicode --install ${LIBWXPYTHON_OPTS}

	#BINARY_DIR "${PREFIX}"		#BINARY_DIR "${PREFIX}"

+5 −2

Original line number	Original line	Diff line number	Diff line
	@@ -27,18 +27,21 @@ Building Kicad with no support for Scripting
	If you set KICAD_BUILD_DYNAMIC the building system will build all and include		If you set KICAD_BUILD_DYNAMIC the building system will build all and include
	the needed libraries for each executable in its bundle		the needed libraries for each executable in its bundle

			cmake -DKICAD_BUILD_DYNAMIC=ON .
			make

	Building Kicad with support for Scripting		Building Kicad with support for Scripting
	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
	Due some problems with some dependencies the build of this kind of binary is a bit		Due some problems with some dependencies the build of this kind of binary is a bit
	more complex, you should initially set KICAD_BUILD_DYNAMIC		more complex, you should initially set KICAD_BUILD_DYNAMIC
	then issue for example		then issue for example

	cmake -DKICAD_BUILD_DYNAMIC=ON		cmake -DKICAD_BUILD_DYNAMIC=ON .
	make lib-wxpython		make lib-wxpython

	After successfully building you can set your KICAD_SCRIPTING* options (for example):		After successfully building you can set your KICAD_SCRIPTING* options (for example):

	cmake -DKICAD_SCRIPTING=ON -DKICAD_SCRIPTING_WXPYTHON=ON		cmake -DKICAD_SCRIPTING=ON -DKICAD_SCRIPTING_WXPYTHON=ON .
	make		make

	The system will build all accordling your choices and package all in the bundle		The system will build all accordling your choices and package all in the bundle

+4 −4

Original line number	Original line	Diff line number	Diff line
	=== modified file 'wxPython/config.py'		=== modified file 'wxPython/config.py'
	--- wxPython/config.py 2014-02-07 20:23:11 +0000		--- wxPython/config.py 2014-02-08 12:23:31 +0000
	+++ wxPython/config.py 2014-02-07 21:00:18 +0000		+++ wxPython/config.py 2014-02-08 13:58:07 +0000
	@@ -22,6 +22,7 @@		@@ -22,6 +22,7 @@

	import sys, os, glob, fnmatch, tempfile		import sys, os, glob, fnmatch, tempfile
	@@ -17,8 +17,8 @@
	- cflags.append(ARCH)		- cflags.append(ARCH)
	- lflags.append("-arch")		- lflags.append("-arch")
	- lflags.append(ARCH)		- lflags.append(ARCH)
	+ cflags.append('-arch ' + re.sub(',',' -arch ',ARCH))		+ cflags.append("-arch " + re.sub(","," -arch ",ARCH))
	+ lflags.append('-arch ' + re.sub(',',' -arch ',ARCH))		+ #lflags.append("-arch " + re.sub(","," -arch ",ARCH))

	if not os.environ.get('CC') or not os.environ.get('CXX'):		if not os.environ.get('CC') or not os.environ.get('CXX'):
	os.environ["CXX"] = getWxConfigValue('--cxx')		os.environ["CXX"] = getWxConfigValue('--cxx')