Created
March 31, 2017 06:23
-
-
Save metacollin/01b57ca8e0d2641a305d9e07c83a5903 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt | |
index 20769c6a4..b2ca04545 100644 | |
--- a/pcbnew/CMakeLists.txt | |
+++ b/pcbnew/CMakeLists.txt | |
@@ -765,31 +765,31 @@ if( KICAD_SCRIPTING_MODULES ) | |
# put everything into bundle at build time, it is relocated at install | |
add_custom_target( ScriptingModulesPcbnewSoCopy ALL | |
COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_BINARY_DIR}/pcbnew/_pcbnew.so" "${PYTHON_DEST}/" | |
- DEPENDS _pcbnew | |
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.so | |
COMMENT "Copying _pcbnew.so into ${PYTHON_DEST}" | |
) | |
add_dependencies( ScriptingModulesPcbnewSoCopy ScriptingWxpythonCopy ) | |
set( PYMOD_EXT "so" ) | |
+ set( KIFACE_TMP_PATH "${OSX_BUNDLE_BUILD_KIFACE_DIR}/") | |
else() # only linux remains among supported platforms | |
install( FILES ${CMAKE_BINARY_DIR}/pcbnew/_pcbnew.so DESTINATION ${PYTHON_DEST} ) | |
set( PYMOD_EXT "so" ) | |
+ set( KIFACE_TMP_PATH "") | |
endif() | |
# For phase 1, copy _pcbnew.kiface to the python module. | |
add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.${PYMOD_EXT} | |
DEPENDS pcbnew_kiface | |
- COMMAND ${CMAKE_COMMAND} -E copy _pcbnew.kiface _pcbnew.${PYMOD_EXT} | |
+ COMMAND ${CMAKE_COMMAND} -E copy ${KIFACE_TMP_PATH}_pcbnew.kiface _pcbnew.${PYMOD_EXT} | |
COMMENT "Creating python's pcbnew native module _pcbnew.${PYMOD_EXT} for command line use." | |
) | |
add_custom_target( | |
pcbnew_python_module ALL | |
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.${PYMOD_EXT} | |
) | |
- | |
endif() | |
- | |
if( APPLE ) | |
if( KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES ) | |
# find wx-X.Y-osx_cocoa path below PYTHON_SITE_PACKAGE_PATH |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment