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

eeschema: fix compil issue. Boost build: boost lib context built only on OSX (does not build on mingw, and not needed)

This commit is contained in:
jean-pierre charras 2013-12-29 23:05:06 +01:00
parent 573b7424dc
commit 7fa0aa8f4f
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeModules/download_boost.cmake
View File

@ -40,9 +40,15 @@ set( BOOST_ROOT "${PROJECT_SOURCE_DIR}/boost_root" )
# Space separated list which indicates the subset of boost libraries to compile. # Space separated list which indicates the subset of boost libraries to compile.
# Chosen libraries are based on AVHTTP requirements, and possibly # Chosen libraries are based on AVHTTP requirements, and possibly
# unit_test_framework for its own worth. # unit_test_framework for its own worth.
# tool_manager.cpp -> coroutine -> context (_jump_fcontext) # tool_manager.cpp -> coroutine -> context (_jump_fcontext) (on OSX)
if( APPLE )
set( BOOST_EXTRA_LIBS "context" )
else()
set( BOOST_EXTRA_LIBS "" )
endif()
set( BOOST_LIBS_BUILT set( BOOST_LIBS_BUILT
context ${BOOST_EXTRA_LIBS}
#coroutine #coroutine
date_time date_time
#exception #exception

2
eeschema/schematic_undo_redo.cpp
View File

@ -269,7 +269,7 @@ void SCH_EDIT_FRAME::PutDataInPreviousState( PICKED_ITEMS_LIST* aList, bool aRed
for( int ii = aList->GetCount() - 1; ii >= 0; ii-- ) for( int ii = aList->GetCount() - 1; ii >= 0; ii-- )
{ {
item = (SCH_ITEM*) aList->GetPickedItem( ii ); item = (SCH_ITEM*) aList->GetPickedItem( ii );
wxAssert( item ); wxASSERT( item );
item->ClearFlags(); item->ClearFlags();