move ${Boost_LIBRARIES} into cvpcb, pcbnew, _pcbnew and out of github, because worker threads used regardless of github
This commit is contained in:
parent
dba4fccec9
commit
d8b270ca4d
|
@ -107,6 +107,7 @@ target_link_libraries( cvpcb
|
|||
${GDI_PLUS_LIBRARIES}
|
||||
${GLEW_LIBRARIES}
|
||||
${CAIRO_LIBRARIES}
|
||||
${Boost_LIBRARIES}
|
||||
)
|
||||
|
||||
# Only for win32 cross compilation using MXE
|
||||
|
|
|
@ -9,11 +9,9 @@
|
|||
/// Using an unnamed resource is easier, providing a textual name for a
|
||||
/// constructor is cumbersome, so we make choice on that criteria mostly:
|
||||
|
||||
#if 0
|
||||
#if 1
|
||||
|
||||
// This is a fine choice between the two, but requires linking to ${Boost_LIBRARIES}
|
||||
// which currently only happens when GITHUB_PLUGIN goes into pcbnew or _pcbnew.
|
||||
// cvpcb is left out. Changing the 4 CMakeLists.txts fixes all this easily.
|
||||
|
||||
#include <boost/interprocess/sync/interprocess_mutex.hpp>
|
||||
#include <boost/interprocess/sync/scoped_lock.hpp>
|
||||
|
@ -23,6 +21,8 @@ typedef boost::interprocess::scoped_lock<MUTEX> MUTLOCK;
|
|||
|
||||
#else
|
||||
|
||||
// This choice also works.
|
||||
|
||||
#include <wx/thread.h>
|
||||
|
||||
typedef wxMutex MUTEX;
|
||||
|
|
|
@ -379,6 +379,7 @@ if( KICAD_SCRIPTING_MODULES )
|
|||
${GDI_PLUS_LIBRARIES}
|
||||
${PYTHON_LIBRARIES}
|
||||
${PCBNEW_EXTRA_LIBS}
|
||||
${Boost_LIBRARIES}
|
||||
)
|
||||
|
||||
# create .i files from XML doxygen parsing, docstrings.i will include all of them
|
||||
|
@ -532,6 +533,8 @@ endif()
|
|||
# Link executable target pcbnew with correct libraries
|
||||
###
|
||||
|
||||
message( STATUS "Boost_LIBRARIES:${Boost_LIBRARIES}" )
|
||||
|
||||
target_link_libraries( pcbnew
|
||||
3d-viewer
|
||||
pcbcommon
|
||||
|
@ -550,11 +553,12 @@ target_link_libraries( pcbnew
|
|||
${PCBNEW_EXTRA_LIBS}
|
||||
${GLEW_LIBRARIES}
|
||||
${CAIRO_LIBRARIES}
|
||||
${Boost_LIBRARIES}
|
||||
)
|
||||
|
||||
# Only for win32 cross compilation using MXE
|
||||
if( WIN32 AND MSYS AND CMAKE_CROSSCOMPILING )
|
||||
target_link_libraries(pcbnew
|
||||
target_link_libraries( pcbnew
|
||||
opengl32
|
||||
glu32
|
||||
pixman-1
|
||||
|
|
|
@ -58,9 +58,9 @@ add_library( github_plugin
|
|||
github_plugin.cpp
|
||||
)
|
||||
|
||||
# No, you don't get github without boost and openssl
|
||||
# No, you don't get github without boost and openssl. Boost_LIBRARIES now moved up
|
||||
# into CMakeLists.txt for pcbnew and cvpcb:
|
||||
target_link_libraries( github_plugin
|
||||
${Boost_LIBRARIES}
|
||||
${OPENSSL_LIBRARIES}
|
||||
)
|
||||
|
||||
|
|
Loading…
Reference in New Issue