From 0ba08f57f2fb8bb492ad514ac953e80a13cba549 Mon Sep 17 00:00:00 2001
From: Adam Wolf <adamwolf@feelslikeburning.com>
Date: Tue, 24 Dec 2019 22:17:35 -0600
Subject: [PATCH] Add macOS KICAD_BUNDLE_LIBS search path for bundle fixup.

(cherry-picked from ac20428b82cbcffc3784b616c25974fd24439bd7)
---
 kicad/CMakeLists.txt               | 9 +++++++--
 utils/kicad-ogltest/CMakeLists.txt | 5 ++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/kicad/CMakeLists.txt b/kicad/CMakeLists.txt
index 0686174fd7..4189882d62 100644
--- a/kicad/CMakeLists.txt
+++ b/kicad/CMakeLists.txt
@@ -95,12 +95,17 @@ if( APPLE )
         set( SCRIPTING_HELPER "0" )
     endif()
 
+    if( KICAD_USE_OCC )
+        set( KICAD_BUNDLE_LIBS ${OCC_LIBRARY_DIR} )
+    endif()
+
     # make main bundle relocatable
     install( CODE "
         # find all libs and modules
         file( GLOB PLUGINS_KIFACE ${OSX_BUNDLE_INSTALL_KIFACE_DIR}/*.kiface )
         file( GLOB_RECURSE PLUGINS_SO ${OSX_BUNDLE_INSTALL_PLUGIN_DIR}/*.so )
-        set( BUNDLE_FIX_LIBS \${PLUGINS_KIFACE} \${PLUGINS_SO} )
+        file( GLOB_RECURSE PLUGINS_3D ${OSX_BUNDLE_INSTALL_PLUGIN_DIR}/3d/*.dylib )
+        set( BUNDLE_FIX_LIBS \${PLUGINS_KIFACE} \${PLUGINS_SO} \${PLUGINS_3D} )
         if( ${SCRIPTING_HELPER} )
             file( GLOB WXPYTHON_DIR RELATIVE ${OSX_BUNDLE_INSTALL_LIB_DIR}/${PYTHON_LIB_DIR} ${OSX_BUNDLE_INSTALL_LIB_DIR}/${PYTHON_LIB_DIR}/wx-?.?-osx_cocoa )
             file( GLOB PYTHON_SCRIPTING_SO ${OSX_BUNDLE_INSTALL_LIB_DIR}/${PYTHON_LIB_DIR}/*.so )
@@ -117,7 +122,7 @@ if( APPLE )
 
         fixup_bundle( ${OSX_BUNDLE_INSTALL_BIN_DIR}/kicad
             \"\${BUNDLE_FIX_LIBS}\"
-            \"\"
+            \" ${KICAD_BUNDLE_LIBS}\"
             )
         " COMPONENT Runtime
         )
diff --git a/utils/kicad-ogltest/CMakeLists.txt b/utils/kicad-ogltest/CMakeLists.txt
index 0d8eaa9bb6..e425930a29 100644
--- a/utils/kicad-ogltest/CMakeLists.txt
+++ b/utils/kicad-ogltest/CMakeLists.txt
@@ -27,6 +27,9 @@ target_link_libraries( kicad-ogltest
     ${wxWidgets_LIBRARIES} )
 
 if( APPLE )
+    if( KICAD_USE_OCC )
+        set( KICAD_BUNDLE_LIBS ${OCC_LIBRARIES} )
+    endif()
     # puts binary into the main kicad.app bundle while linking
     set_target_properties( kicad-ogltest PROPERTIES
             RUNTIME_OUTPUT_DIRECTORY ${OSX_BUNDLE_BUILD_BIN_DIR}
@@ -40,7 +43,7 @@ if( APPLE )
         include( BundleUtilities )
         fixup_bundle( ${OSX_BUNDLE_BUILD_BIN_DIR}/kicad-ogltest
             \"\"
-            \"\"
+            \" ${KICAD_BUNDLE_LIBS}\"
             )
         " COMPONENT Runtime
         )