diff --git a/bitmap2component/CMakeLists.txt b/bitmap2component/CMakeLists.txt index 3b45e9d348..c766530052 100644 --- a/bitmap2component/CMakeLists.txt +++ b/bitmap2component/CMakeLists.txt @@ -76,7 +76,7 @@ if( APPLE ) include( BundleUtilities ) fixup_bundle( ${KICAD_BIN}/bitmap2component.app/Contents/MacOS/bitmap2component \"\" - \"\" + \"${PYTHON_FRAMEWORK}\" ) " COMPONENT Runtime ) diff --git a/cmake/BundleUtilities.cmake b/cmake/BundleUtilities.cmake index cd27c82b8c..f636f3553e 100644 --- a/cmake/BundleUtilities.cmake +++ b/cmake/BundleUtilities.cmake @@ -914,11 +914,11 @@ endfunction() function(fixup_bundle app libs dirs) - message(STATUS "fixup_bundle") + message(STATUS "fixup_bundleY") message(STATUS " app='${app}'") message(STATUS " libs='${libs}'") message(STATUS " dirs='${dirs}'") - + message(STATUS "xxxxxxxxx") set(options) set(oneValueArgs) set(multiValueArgs IGNORE_ITEM) @@ -930,7 +930,7 @@ function(fixup_bundle app libs dirs) if(valid) 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}") 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) get_item_rpaths(${f} _main_exe_rpaths) + message(STATUS "pqr: ${f}") get_prerequisites("${f}" prereqs 1 1 "${exepath}" "${_main_exe_rpaths}") - + message(STATUS "pqf: ${prereqs}") # On the Mac, # "embedded" and "system" prerequisites are fine... anything else means # 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}) set(p_type "") + message(STATUS "pqq: ${p}") gp_file_type("${f}" "${p}" p_type) if(APPLE) @@ -1063,6 +1065,7 @@ function(verify_bundle_prerequisites bundle result_var info_var) # Found non-system/somehow-unacceptable prerequisites: set(result 0) set(info ${info} "external prerequisites found:\nf='${f}'\nexternal_prereqs='${external_prereqs}'\n") + execute_process(COMMAND sleep 1000 RESULT_VARIABLE res) endif() else() message(STATUS "Ignoring file: ${prereq_filename}") diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt index 1227223e90..2970bc035b 100644 --- a/eeschema/CMakeLists.txt +++ b/eeschema/CMakeLists.txt @@ -545,7 +545,13 @@ if( APPLE ) DESTINATION ${KICAD_BIN} 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 " # override default embedded path settings ${OSX_BUNDLE_OVERRIDE_PATHS} @@ -554,7 +560,7 @@ if( APPLE ) include( BundleUtilities ) fixup_bundle( ${KICAD_BIN}/eeschema.app/Contents/MacOS/eeschema \"\" - \"\" + \"${PYTHON_FRAMEWORK}\" ) " COMPONENT Runtime ) diff --git a/gerbview/CMakeLists.txt b/gerbview/CMakeLists.txt index d21fbc0868..3c9afe863b 100644 --- a/gerbview/CMakeLists.txt +++ b/gerbview/CMakeLists.txt @@ -189,7 +189,7 @@ if( APPLE ) include( BundleUtilities ) fixup_bundle( ${KICAD_BIN}/gerbview.app/Contents/MacOS/gerbview \"\" - \"\" + \"${PYTHON_FRAMEWORK}\" ) " COMPONENT Runtime ) diff --git a/kicad/CMakeLists.txt b/kicad/CMakeLists.txt index e0fa180ff1..e0e58448ba 100644 --- a/kicad/CMakeLists.txt +++ b/kicad/CMakeLists.txt @@ -247,8 +247,8 @@ if( APPLE ) fixup_bundle( ${OSX_BUNDLE_INSTALL_BIN_DIR}/kicad \"\${BUNDLE_FIX_LIBS}\" - \"\${BUNDLE_FIX_DIRS}\" - IGNORE_ITEM \"Python;python;python3;python3.8;pythonw;pythonw3;pythonw3.8\" + \"\${BUNDLE_FIX_DIRS};${PYTHON_FRAMEWORK}\" + 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 diff --git a/pagelayout_editor/CMakeLists.txt b/pagelayout_editor/CMakeLists.txt index 5f503d479e..abb7a0a626 100644 --- a/pagelayout_editor/CMakeLists.txt +++ b/pagelayout_editor/CMakeLists.txt @@ -153,7 +153,7 @@ if( APPLE ) include( BundleUtilities ) fixup_bundle( ${KICAD_BIN}/pl_editor.app/Contents/MacOS/pl_editor \"\" - \"\" + \"${PYTHON_FRAMEWORK}\" ) " COMPONENT Runtime ) diff --git a/pcb_calculator/CMakeLists.txt b/pcb_calculator/CMakeLists.txt index f58e348d27..cc4193a0a6 100644 --- a/pcb_calculator/CMakeLists.txt +++ b/pcb_calculator/CMakeLists.txt @@ -152,7 +152,7 @@ if( APPLE ) include( BundleUtilities ) fixup_bundle( ${KICAD_BIN}/pcb_calculator.app/Contents/MacOS/pcb_calculator \"\" - \"\" + \"${PYTHON_FRAMEWORK}\" ) " COMPONENT Runtime ) diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt index 15b522359f..d4d2a156ae 100644 --- a/pcbnew/CMakeLists.txt +++ b/pcbnew/CMakeLists.txt @@ -786,7 +786,7 @@ if( APPLE ) include( BundleUtilities ) fixup_bundle( ${KICAD_BIN}/pcbnew.app/Contents/MacOS/pcbnew \"\" - \"\" + \"${PYTHON_FRAMEWORK}\" ) " COMPONENT Runtime )