haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MacOSX] Cleanup

This commit is contained in:
Marco Serantoni 2013-12-22 20:52:52 +01:00
parent d337d340ee
commit 0dd18c2549
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeModules/download_boost.cmake
View File

@ -88,6 +88,9 @@ endfunction()
string( REPLACE "unit_test_framework" "test" boost_libs_list "${BOOST_LIBS_BUILT}" ) string( REPLACE "unit_test_framework" "test" boost_libs_list "${BOOST_LIBS_BUILT}" )
#message( STATUS "REPLACE libs_csv:${boost_libs_list}" ) #message( STATUS "REPLACE libs_csv:${boost_libs_list}" )
# Default Toolset
set( BOOST_TOOLSET "toolset=gcc" )
if( MINGW ) if( MINGW )
if( MSYS ) if( MSYS )
# The Boost system does not build properly on MSYS using bootstrap.sh. Running # The Boost system does not build properly on MSYS using bootstrap.sh. Running
@ -113,7 +116,6 @@ else()
unset( b2_libs ) unset( b2_libs )
endif() endif()
set( TOOLSET "toolset=gcc" )
if( APPLE ) if( APPLE )
# I set this to being compatible with wxWidgets # I set this to being compatible with wxWidgets
@ -121,7 +123,7 @@ if( APPLE )
# has switched to libc++ (llvm) by default # has switched to libc++ (llvm) by default
set(BOOST_CXXFLAGS "cxxflags=-mmacosx-version-min=10.5" ) set(BOOST_CXXFLAGS "cxxflags=-mmacosx-version-min=10.5" )
set(BOOST_LINKFLAGS "linkflags=-mmacosx-version-min=10.5" ) set(BOOST_LINKFLAGS "linkflags=-mmacosx-version-min=10.5" )
set( TOOLSET "" ) set(BOOST_TOOLSET "toolset=darwin" )
if( CMAKE_OSX_ARCHITECTURES ) if( CMAKE_OSX_ARCHITECTURES )
@ -169,7 +171,7 @@ ExternalProject_Add( boost
variant=release variant=release
threading=multi threading=multi
${PIC_STUFF} ${PIC_STUFF}
${TOOLSET} ${BOOST_TOOLSET}
${BOOST_CXXFLAGS} ${BOOST_CXXFLAGS}
${BOOST_LINKFLAGS} ${BOOST_LINKFLAGS}
${BOOST_ADDRESSMODEL} ${BOOST_ADDRESSMODEL}