Skip to content

K
kicad-source-mirror
Commit a9ab8243 authored by Bernhard Stegmaier's avatar Bernhard Stegmaier Committed by Wayne Stambaugh
Browse files
Options

Fix OSX wxPython scripting build when running parallel builds.

parent ef2337ca
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 3 deletions
pcbnew/CMakeLists.txt
View file @ a9ab8243
...@@ -689,10 +689,11 @@ if( KICAD_SCRIPTING ) ...@@ -689,10 +689,11 @@ if( KICAD_SCRIPTING )
else() else()
# put into bundle at build time, it is relocated at install # put into bundle at build time, it is relocated at install
add_custom_target( ScriptingPcbnewPyCopy ALL add_custom_target( ScriptingPcbnewPyCopy ALL
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_BINARY_DIR}/pcbnew/pcbnew.py" "${PYTHON_DEST}" COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_BINARY_DIR}/pcbnew/pcbnew.py" "${PYTHON_DEST}/"
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 )
# scripting plugins # scripting plugins
install( DIRECTORY ${PROJECT_SOURCE_DIR}/pcbnew/scripting/plugins/ install( DIRECTORY ${PROJECT_SOURCE_DIR}/pcbnew/scripting/plugins/
DESTINATION ${KICAD_DATA}/scripting/plugins DESTINATION ${KICAD_DATA}/scripting/plugins
...@@ -713,10 +714,11 @@ if( KICAD_SCRIPTING_MODULES ) ...@@ -713,10 +714,11 @@ if( KICAD_SCRIPTING_MODULES )
else() else()
# put everything into bundle at build time, it is relocated at install # put everything into bundle at build time, it is relocated at install
add_custom_target( ScriptingModulesPcbnewPyCopy ALL add_custom_target( ScriptingModulesPcbnewPyCopy ALL
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_BINARY_DIR}/pcbnew/pcbnew.py" "${PYTHON_DEST}" COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_BINARY_DIR}/pcbnew/pcbnew.py" "${PYTHON_DEST}/"
DEPENDS FixSwigImportsModuleScripting DEPENDS FixSwigImportsModuleScripting
COMMENT "Copying pcbnew.py into ${PYTHON_DEST}" COMMENT "Copying pcbnew.py into ${PYTHON_DEST}"
) )
add_dependencies( ScriptingModulesPcbnewPyCopy ScriptingWxpythonCopy )
endif() endif()
if( MINGW ) if( MINGW )
...@@ -724,10 +726,11 @@ if( KICAD_SCRIPTING_MODULES ) ...@@ -724,10 +726,11 @@ if( KICAD_SCRIPTING_MODULES )
elseif( APPLE ) elseif( APPLE )
# put everything into bundle at build time, it is relocated at install # put everything into bundle at build time, it is relocated at install
add_custom_target( ScriptingModulesPcbnewSoCopy ALL add_custom_target( ScriptingModulesPcbnewSoCopy ALL
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_BINARY_DIR}/pcbnew/_pcbnew.so" "${PYTHON_DEST}" COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_BINARY_DIR}/pcbnew/_pcbnew.so" "${PYTHON_DEST}/"
DEPENDS _pcbnew DEPENDS _pcbnew
COMMENT "Copying _pcbnew.so into ${PYTHON_DEST}" COMMENT "Copying _pcbnew.so into ${PYTHON_DEST}"
) )
add_dependencies( ScriptingModulesPcbnewSoCopy ScriptingWxpythonCopy )
else() else()
install( FILES ${CMAKE_BINARY_DIR}/pcbnew/_pcbnew.so DESTINATION ${PYTHON_DEST} ) install( FILES ${CMAKE_BINARY_DIR}/pcbnew/_pcbnew.so DESTINATION ${PYTHON_DEST} )
endif() endif()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment