From 91290e8f75ac484be7e8fccacd82bb477dd7185d Mon Sep 17 00:00:00 2001
From: Alexander Dewing <alexander@moveparallel.com>
Date: Fri, 2 Sep 2022 00:23:34 -0700
Subject: [PATCH] vsrious cleanup, seeing if we dont need to ignore_item for
 python

---
 cmake/BundleUtilities.cmake | 9 ++-------
 eeschema/CMakeLists.txt     | 8 +-------
 kicad/CMakeLists.txt        | 2 +-
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/cmake/BundleUtilities.cmake b/cmake/BundleUtilities.cmake
index f636f3553e..7712ab4a5e 100644
--- a/cmake/BundleUtilities.cmake
+++ b/cmake/BundleUtilities.cmake
@@ -914,11 +914,10 @@ endfunction()
 
 
 function(fixup_bundle app libs dirs)
-  message(STATUS "fixup_bundleY")
+  message(STATUS "fixup_bundle")
   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 +929,7 @@ function(fixup_bundle app libs dirs)
   if(valid)
     get_filename_component(exepath "${executable}" PATH)
 
-    message(STATUS "fixup_bundle: preparingX...")
+    message(STATUS "fixup_bundle: preparing...")
     get_bundle_keys("${app}" "${libs}" "${dirs}" keys IGNORE_ITEM "${CFG_IGNORE_ITEM}")
 
     message(STATUS "fixup_bundle: copying...")
@@ -1031,9 +1030,7 @@ 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
@@ -1047,7 +1044,6 @@ 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)
@@ -1065,7 +1061,6 @@ 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 2970bc035b..c770371d91 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -545,13 +545,7 @@ 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}
diff --git a/kicad/CMakeLists.txt b/kicad/CMakeLists.txt
index e0e58448ba..166cb34d8e 100644
--- a/kicad/CMakeLists.txt
+++ b/kicad/CMakeLists.txt
@@ -248,7 +248,7 @@ if( APPLE )
             fixup_bundle( ${OSX_BUNDLE_INSTALL_BIN_DIR}/kicad
                 \"\${BUNDLE_FIX_LIBS}\"
                 \"\${BUNDLE_FIX_DIRS};${PYTHON_FRAMEWORK}\"
-                IGNORE_ITEM \"Python;python;python3;python3.9;pythonw;pythonw3;pythonw3.9;python3.9-intel64\"
+                IGNORE_ITEM \"Python;python;python3;python3.8;pythonw;pythonw3;pythonw3.8\"
                 )
 
             # BundleUtilities clobbers the rpaths and install_names that we carefully setup in Python.framework, even if