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

pcbnew: Fix cmake to work with no wxPython on macOS 

(cherry-picked from bf5dba847c)
This commit is contained in:
Ian McInerney 2019-12-22 02:04:15 +00:00
parent 79954657e2
commit b6f9bfe9a5
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pcbnew/CMakeLists.txt
View File

@ -758,7 +758,7 @@ if( KICAD_SCRIPTING )
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/pcbnew.py DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/pcbnew.py
COMMENT "Copying pcbnew.py into ${PYTHON_DEST}" COMMENT "Copying pcbnew.py into ${PYTHON_DEST}"
) )
add_dependencies( ScriptingPcbnewPyCopy ScriptingWxpythonCopy ) add_dependencies( ScriptingPcbnewPyCopy ScriptingPythonDirectoryCreation )
endif() endif()
# python plugins # python plugins
@ -805,7 +805,7 @@ if( KICAD_SCRIPTING_MODULES )
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.so DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.so
COMMENT "Copying _pcbnew.so into ${PYTHON_DEST}" COMMENT "Copying _pcbnew.so into ${PYTHON_DEST}"
) )
add_dependencies( ScriptingModulesPcbnewSoCopy ScriptingWxpythonCopy ) add_dependencies( ScriptingModulesPcbnewSoCopy ScriptingPythonDirectoryCreation )
set( PYMOD_EXT "so" ) set( PYMOD_EXT "so" )
else() # only linux remains among supported platforms else() # only linux remains among supported platforms
add_library( pcbnew_python MODULE $<TARGET_OBJECTS:pcbnew_kiface_objects> ) add_library( pcbnew_python MODULE $<TARGET_OBJECTS:pcbnew_kiface_objects> )
@ -846,6 +846,14 @@ endif()
if( APPLE ) if( APPLE )
if( KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES ) if( KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES )
# If we don't have wxPython, then we must create the site-packages directory
add_custom_target( ScriptingPythonDirectoryCreation ALL
COMMAND ${CMAKE_COMMAND} -E make_directory "${PYTHON_DEST}"
COMMENT "Creating Python library directory ${PYTHON_DEST}"
)
endif()
if( KICAD_SCRIPTING_WXPYTHON )
# find wx-X.Y-osx_cocoa path below PYTHON_SITE_PACKAGE_PATH # find wx-X.Y-osx_cocoa path below PYTHON_SITE_PACKAGE_PATH
file( GLOB WXPYTHON_DIR RELATIVE ${PYTHON_SITE_PACKAGE_PATH} ${PYTHON_SITE_PACKAGE_PATH}/wx-?.?-osx_cocoa ) file( GLOB WXPYTHON_DIR RELATIVE ${PYTHON_SITE_PACKAGE_PATH} ${PYTHON_SITE_PACKAGE_PATH}/wx-?.?-osx_cocoa )
if( NOT WXPYTHON_DIR ) if( NOT WXPYTHON_DIR )
@ -857,5 +865,6 @@ if( APPLE )
COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_SITE_PACKAGE_PATH}/wxversion.py" "${PYTHON_DEST}" COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_SITE_PACKAGE_PATH}/wxversion.py" "${PYTHON_DEST}"
COMMENT "Copying wxPython into ${PYTHON_DEST}" COMMENT "Copying wxPython into ${PYTHON_DEST}"
) )
add_dependencies( ScriptingWxpythonCopy ScriptingPythonDirectoryCreation )
endif() endif()
endif() endif()