Commit d8b270ca authored by Dick Hollenbeck's avatar Dick Hollenbeck
Browse files

move ${Boost_LIBRARIES} into cvpcb, pcbnew, _pcbnew and out of github, because... 

move ${Boost_LIBRARIES} into cvpcb, pcbnew, _pcbnew and out of github, because worker threads used regardless of github
parent dba4fcce

cvpcb/CMakeLists.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -107,6 +107,7 @@ 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

include/ki_mutex.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -9,11 +9,9 @@ 
/// Using an unnamed resource is easier, providing a textual name for a

/// Using an unnamed resource is easier, providing a textual name for a

/// constructor is cumbersome, so we make choice on that criteria mostly:

/// 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}

// 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/interprocess_mutex.hpp>

#include <boost/interprocess/sync/scoped_lock.hpp>

#include <boost/interprocess/sync/scoped_lock.hpp>
@@ -23,6 +21,8 @@ typedef boost::interprocess::scoped_lock<MUTEX> MUTLOCK; 




#else

#else





// This choice also works.



#include <wx/thread.h>

#include <wx/thread.h>





typedef wxMutex             MUTEX;

typedef wxMutex             MUTEX;

pcbnew/CMakeLists.txt

+5 −1
Original line number Original line Diff line number Diff line
@@ -379,6 +379,7 @@ if( KICAD_SCRIPTING_MODULES ) 
        ${GDI_PLUS_LIBRARIES}

        ${GDI_PLUS_LIBRARIES}

        ${PYTHON_LIBRARIES}

        ${PYTHON_LIBRARIES}

        ${PCBNEW_EXTRA_LIBS}

        ${PCBNEW_EXTRA_LIBS}

        ${Boost_LIBRARIES}

        )

        )





     # 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
@@ -532,6 +533,8 @@ 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
@@ -550,6 +553,7 @@ target_link_libraries( pcbnew 
    ${PCBNEW_EXTRA_LIBS}

    ${PCBNEW_EXTRA_LIBS}

    ${GLEW_LIBRARIES}

    ${GLEW_LIBRARIES}

    ${CAIRO_LIBRARIES}

    ${CAIRO_LIBRARIES}

    ${Boost_LIBRARIES}

    )

    )





# Only for win32 cross compilation using MXE

# Only for win32 cross compilation using MXE

pcbnew/github/CMakeLists.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -58,9 +58,9 @@ add_library( github_plugin 
    github_plugin.cpp

    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

target_link_libraries( github_plugin

    ${Boost_LIBRARIES}

    ${OPENSSL_LIBRARIES}

    ${OPENSSL_LIBRARIES}

    )

    )