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

molding mercury.

This commit is contained in:
Dick Hollenbeck 2013-12-09 13:06:47 -06:00
parent d8b270ca4d
commit 3582df6a0b
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/footprint_info.cpp
View File

@ -321,7 +321,7 @@ bool FOOTPRINT_LIST::ReadFootprintFiles( FP_LIB_TABLE* aTable, const wxString* a
i += jobz; i += jobz;
} }
// Wait for all the worder threads to complete, it does not matter in what order // Wait for all the worker threads to complete, it does not matter in what order
// we wait for them as long as a full sweep is made. Think of the great race, // we wait for them as long as a full sweep is made. Think of the great race,
// everyone must finish. // everyone must finish.
for( unsigned i=0; i<threads.size(); ++i ) for( unsigned i=0; i<threads.size(); ++i )

4
cvpcb/CMakeLists.txt
View File

@ -107,7 +107,6 @@ target_link_libraries( cvpcb
${GDI_PLUS_LIBRARIES} ${GDI_PLUS_LIBRARIES}
${GLEW_LIBRARIES} ${GLEW_LIBRARIES}
${CAIRO_LIBRARIES} ${CAIRO_LIBRARIES}
${Boost_LIBRARIES}
) )
# Only for win32 cross compilation using MXE # Only for win32 cross compilation using MXE
@ -127,6 +126,9 @@ if( BUILD_GITHUB_PLUGIN )
target_link_libraries( cvpcb github_plugin ) target_link_libraries( cvpcb github_plugin )
endif() endif()
# Must follow github_plugin
target_link_libraries( cvpcb ${Boost_LIBRARIES} )
### ###
# Add cvpcb as install target # Add cvpcb as install target

6
pcbnew/CMakeLists.txt
View File

@ -379,7 +379,7 @@ if( KICAD_SCRIPTING_MODULES )
${GDI_PLUS_LIBRARIES} ${GDI_PLUS_LIBRARIES}
${PYTHON_LIBRARIES} ${PYTHON_LIBRARIES}
${PCBNEW_EXTRA_LIBS} ${PCBNEW_EXTRA_LIBS}
${Boost_LIBRARIES} ${Boost_LIBRARIES} # must follow GITHUB
) )
# create .i files from XML doxygen parsing, docstrings.i will include all of them # create .i files from XML doxygen parsing, docstrings.i will include all of them
@ -533,8 +533,6 @@ endif()
# Link executable target pcbnew with correct libraries # Link executable target pcbnew with correct libraries
### ###
message( STATUS "Boost_LIBRARIES:${Boost_LIBRARIES}" )
target_link_libraries( pcbnew target_link_libraries( pcbnew
3d-viewer 3d-viewer
pcbcommon pcbcommon
@ -553,7 +551,7 @@ target_link_libraries( pcbnew
${PCBNEW_EXTRA_LIBS} ${PCBNEW_EXTRA_LIBS}
${GLEW_LIBRARIES} ${GLEW_LIBRARIES}
${CAIRO_LIBRARIES} ${CAIRO_LIBRARIES}
${Boost_LIBRARIES} ${Boost_LIBRARIES} # must follow GITHUB
) )
# Only for win32 cross compilation using MXE # Only for win32 cross compilation using MXE