Tweaks to build

This commit is contained in:
Marek Roszko 2021-04-26 20:32:09 -04:00 committed by Seth Hillbrand
parent d585b6580d
commit 04ab71c47c
2 changed files with 4 additions and 2 deletions

View File

@ -38,6 +38,7 @@
#include <wx/filename.h> #include <wx/filename.h>
#include <wx/gdicmn.h> #include <wx/gdicmn.h>
#undef pid_t
#include <pybind11/embed.h> #include <pybind11/embed.h>
class wxSingleInstanceChecker; class wxSingleInstanceChecker;

View File

@ -10,6 +10,7 @@ add_library( scripting STATIC
target_link_libraries( scripting target_link_libraries( scripting
${wxWidgets_LIBRARIES} # wxLogDebug, wxASSERT ${wxWidgets_LIBRARIES} # wxLogDebug, wxASSERT
${Boost_LIBRARIES} # Because of the OPT types ${Boost_LIBRARIES} # Because of the OPT types
${PYTHON_LIBRARIES}
common common
) )
@ -45,7 +46,7 @@ target_include_directories( scripting_kiface PRIVATE
${wxWidgets_LIBRARIES} ${wxWidgets_LIBRARIES}
${Boost_INCLUDE_DIR} ${Boost_INCLUDE_DIR}
) )
target_link_libraries( scripting_kiface target_link_libraries( scripting_kiface
scripting scripting
) )
@ -55,7 +56,7 @@ set_target_properties( scripting_kiface PROPERTIES
PREFIX ${KIFACE_PREFIX} PREFIX ${KIFACE_PREFIX}
SUFFIX ${KIFACE_SUFFIX} SUFFIX ${KIFACE_SUFFIX}
) )
if( MAKE_LINK_MAPS ) if( MAKE_LINK_MAPS )
set_target_properties( scripting_kiface PROPERTIES set_target_properties( scripting_kiface PROPERTIES
LINK_FLAGS "-Wl,-cref,-Map=_scripting.kiface.map" ) LINK_FLAGS "-Wl,-cref,-Map=_scripting.kiface.map" )