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

Initial arm64 work

This commit is contained in:
Alexander Dewing 2022-04-20 07:17:06 -07:00 committed by Jon Evans
parent a2972eccc7
commit 02325130fa
8 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bitmap2component/CMakeLists.txt
View File

@ -76,7 +76,7 @@ if( APPLE )
include( BundleUtilities ) include( BundleUtilities )
fixup_bundle( ${KICAD_BIN}/bitmap2component.app/Contents/MacOS/bitmap2component fixup_bundle( ${KICAD_BIN}/bitmap2component.app/Contents/MacOS/bitmap2component
\"\" \"\"
\"\" \"${PYTHON_FRAMEWORK}\"
) )
" COMPONENT Runtime " COMPONENT Runtime
) )

11
cmake/BundleUtilities.cmake
View File

@ -914,11 +914,11 @@ endfunction()
function(fixup_bundle app libs dirs) function(fixup_bundle app libs dirs)
message(STATUS "fixup_bundle") message(STATUS "fixup_bundleY")
message(STATUS " app='${app}'") message(STATUS " app='${app}'")
message(STATUS " libs='${libs}'") message(STATUS " libs='${libs}'")
message(STATUS " dirs='${dirs}'") message(STATUS " dirs='${dirs}'")
message(STATUS "xxxxxxxxx")
set(options) set(options)
set(oneValueArgs) set(oneValueArgs)
set(multiValueArgs IGNORE_ITEM) set(multiValueArgs IGNORE_ITEM)
@ -930,7 +930,7 @@ function(fixup_bundle app libs dirs)
if(valid) if(valid)
get_filename_component(exepath "${executable}" PATH) get_filename_component(exepath "${executable}" PATH)
message(STATUS "fixup_bundle: preparing...") message(STATUS "fixup_bundle: preparingX...")
get_bundle_keys("${app}" "${libs}" "${dirs}" keys IGNORE_ITEM "${CFG_IGNORE_ITEM}") get_bundle_keys("${app}" "${libs}" "${dirs}" keys IGNORE_ITEM "${CFG_IGNORE_ITEM}")
message(STATUS "fixup_bundle: copying...") message(STATUS "fixup_bundle: copying...")
@ -1031,8 +1031,9 @@ function(verify_bundle_prerequisites bundle result_var info_var)
if(NOT prereq_filename IN_LIST CFG_IGNORE_ITEM) if(NOT prereq_filename IN_LIST CFG_IGNORE_ITEM)
get_item_rpaths(${f} _main_exe_rpaths) get_item_rpaths(${f} _main_exe_rpaths)
message(STATUS "pqr: ${f}")
get_prerequisites("${f}" prereqs 1 1 "${exepath}" "${_main_exe_rpaths}") get_prerequisites("${f}" prereqs 1 1 "${exepath}" "${_main_exe_rpaths}")
message(STATUS "pqf: ${prereqs}")
# On the Mac, # On the Mac,
# "embedded" and "system" prerequisites are fine... anything else means # "embedded" and "system" prerequisites are fine... anything else means
# the bundle's prerequisites are not verified (i.e., the bundle is not # the bundle's prerequisites are not verified (i.e., the bundle is not
@ -1046,6 +1047,7 @@ function(verify_bundle_prerequisites bundle result_var info_var)
foreach(p ${prereqs}) foreach(p ${prereqs})
set(p_type "") set(p_type "")
message(STATUS "pqq: ${p}")
gp_file_type("${f}" "${p}" p_type) gp_file_type("${f}" "${p}" p_type)
if(APPLE) if(APPLE)
@ -1063,6 +1065,7 @@ function(verify_bundle_prerequisites bundle result_var info_var)
# Found non-system/somehow-unacceptable prerequisites: # Found non-system/somehow-unacceptable prerequisites:
set(result 0) set(result 0)
set(info ${info} "external prerequisites found:\nf='${f}'\nexternal_prereqs='${external_prereqs}'\n") set(info ${info} "external prerequisites found:\nf='${f}'\nexternal_prereqs='${external_prereqs}'\n")
execute_process(COMMAND sleep 1000 RESULT_VARIABLE res)
endif() endif()
else() else()
message(STATUS "Ignoring file: ${prereq_filename}") message(STATUS "Ignoring file: ${prereq_filename}")

10
eeschema/CMakeLists.txt
View File

@ -545,7 +545,13 @@ if( APPLE )
DESTINATION ${KICAD_BIN} DESTINATION ${KICAD_BIN}
COMPONENT binary COMPONENT binary
) )
# get_cmake_property(_variableNames VARIABLES)
# list (SORT _variableNames)
# foreach (_variableName ${_variableNames})
# message(STATUS "${_variableName}=${${_variableName}}")
# endforeach()
# message(STATUS "markmark")
# PYTHON_FRAMEWORK=/Users/alexander/Documents/Code/kicad-mac-builder/build/python-dest/Library/Frameworks/Python.framework
install( CODE " install( CODE "
# override default embedded path settings # override default embedded path settings
${OSX_BUNDLE_OVERRIDE_PATHS} ${OSX_BUNDLE_OVERRIDE_PATHS}
@ -554,7 +560,7 @@ if( APPLE )
include( BundleUtilities ) include( BundleUtilities )
fixup_bundle( ${KICAD_BIN}/eeschema.app/Contents/MacOS/eeschema fixup_bundle( ${KICAD_BIN}/eeschema.app/Contents/MacOS/eeschema
\"\" \"\"
\"\" \"${PYTHON_FRAMEWORK}\"
) )
" COMPONENT Runtime " COMPONENT Runtime
) )

2
gerbview/CMakeLists.txt
View File

@ -189,7 +189,7 @@ if( APPLE )
include( BundleUtilities ) include( BundleUtilities )
fixup_bundle( ${KICAD_BIN}/gerbview.app/Contents/MacOS/gerbview fixup_bundle( ${KICAD_BIN}/gerbview.app/Contents/MacOS/gerbview
\"\" \"\"
\"\" \"${PYTHON_FRAMEWORK}\"
) )
" COMPONENT Runtime " COMPONENT Runtime
) )

4
kicad/CMakeLists.txt
View File

@ -247,8 +247,8 @@ if( APPLE )
fixup_bundle( ${OSX_BUNDLE_INSTALL_BIN_DIR}/kicad fixup_bundle( ${OSX_BUNDLE_INSTALL_BIN_DIR}/kicad
\"\${BUNDLE_FIX_LIBS}\" \"\${BUNDLE_FIX_LIBS}\"
\"\${BUNDLE_FIX_DIRS}\" \"\${BUNDLE_FIX_DIRS};${PYTHON_FRAMEWORK}\"
IGNORE_ITEM \"Python;python;python3;python3.8;pythonw;pythonw3;pythonw3.8\" IGNORE_ITEM \"Python;python;python3;python3.9;pythonw;pythonw3;pythonw3.9;python3.9-intel64\"
) )
# BundleUtilities clobbers the rpaths and install_names that we carefully setup in Python.framework, even if # BundleUtilities clobbers the rpaths and install_names that we carefully setup in Python.framework, even if

2
pagelayout_editor/CMakeLists.txt
View File

@ -153,7 +153,7 @@ if( APPLE )
include( BundleUtilities ) include( BundleUtilities )
fixup_bundle( ${KICAD_BIN}/pl_editor.app/Contents/MacOS/pl_editor fixup_bundle( ${KICAD_BIN}/pl_editor.app/Contents/MacOS/pl_editor
\"\" \"\"
\"\" \"${PYTHON_FRAMEWORK}\"
) )
" COMPONENT Runtime " COMPONENT Runtime
) )

2
pcb_calculator/CMakeLists.txt
View File

@ -152,7 +152,7 @@ if( APPLE )
include( BundleUtilities ) include( BundleUtilities )
fixup_bundle( ${KICAD_BIN}/pcb_calculator.app/Contents/MacOS/pcb_calculator fixup_bundle( ${KICAD_BIN}/pcb_calculator.app/Contents/MacOS/pcb_calculator
\"\" \"\"
\"\" \"${PYTHON_FRAMEWORK}\"
) )
" COMPONENT Runtime " COMPONENT Runtime
) )

2
pcbnew/CMakeLists.txt
View File

@ -786,7 +786,7 @@ if( APPLE )
include( BundleUtilities ) include( BundleUtilities )
fixup_bundle( ${KICAD_BIN}/pcbnew.app/Contents/MacOS/pcbnew fixup_bundle( ${KICAD_BIN}/pcbnew.app/Contents/MacOS/pcbnew
\"\" \"\"
\"\" \"${PYTHON_FRAMEWORK}\"
) )
" COMPONENT Runtime " COMPONENT Runtime
) )