Skip to content

Instantly share code, notes, and snippets.

@ipatch
Last active December 4, 2021 18:34
Show Gist options
  • Save ipatch/b32ceefc45fb84341cd5565caaed7e71 to your computer and use it in GitHub Desktop.
Save ipatch/b32ceefc45fb84341cd5565caaed7e71 to your computer and use it in GitHub Desktop.
patch file for homebrew freecad installation
diff -ruN FreeCAD-0.19.2/src/Mod/Cam/App/CMakeLists.txt FreeCAD-0.19.2.pr4960/src/Mod/Cam/App/CMakeLists.txt
--- FreeCAD-0.19.2/src/Mod/Cam/App/CMakeLists.txt 2021-04-15 04:17:08.000000000 -0500
+++ FreeCAD-0.19.2.pr4960/src/Mod/Cam/App/CMakeLists.txt 2021-12-04 12:25:58.000000000 -0600
@@ -14,7 +14,7 @@
${OCC_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR}
${PYTHON_INCLUDE_PATH}
- ${XERCESC_INCLUDE_DIR}
+ ${XercesC_INCLUDE_DIR}
${UMFPACK_INCLUDE_DIR}
${SMSH_INCLUDE_DIR}
${SMESH_INCLUDE_DIR}
diff -ruN FreeCAD-0.19.2/src/Mod/Cam/Gui/CMakeLists.txt FreeCAD-0.19.2.pr4960/src/Mod/Cam/Gui/CMakeLists.txt
--- FreeCAD-0.19.2/src/Mod/Cam/Gui/CMakeLists.txt 2021-04-15 04:17:08.000000000 -0500
+++ FreeCAD-0.19.2.pr4960/src/Mod/Cam/Gui/CMakeLists.txt 2021-12-04 12:26:33.000000000 -0600
@@ -13,7 +13,7 @@
${PYTHON_INCLUDE_PATH}
${QT_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR}
- ${XERCESC_INCLUDE_DIR}
+ ${XercesC_INCLUDE_DIR}
${SMSH_INCLUDE_DIR}
${SMESH_INCLUDE_DIR}
)
diff -ruN FreeCAD-0.19.2/src/Mod/Measure/App/CMakeLists.txt FreeCAD-0.19.2.pr4960/src/Mod/Measure/App/CMakeLists.txt
--- FreeCAD-0.19.2/src/Mod/Measure/App/CMakeLists.txt 2021-04-15 04:17:08.000000000 -0500
+++ FreeCAD-0.19.2.pr4960/src/Mod/Measure/App/CMakeLists.txt 2021-12-04 12:28:16.000000000 -0600
@@ -13,7 +13,7 @@
${OCC_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR}
${PYTHON_INCLUDE_PATH}
- ${XERCESC_INCLUDE_DIR}
+ ${XercesC_INCLUDE_DIR}
)
link_directories(${OCC_LIBRARY_DIR})
diff --git a/src/MacAppBundle/CMakeLists.txt b/src/MacAppBundle/CMakeLists.txt
index c0b6ccf09f..b64cd761bf 100644
--- a/src/MacAppBundle/CMakeLists.txt
+++ b/src/MacAppBundle/CMakeLists.txt
@@ -112,16 +112,16 @@ install(CODE "execute_process(COMMAND chmod -R a+w ${CMAKE_INSTALL_LIBDIR})")
get_filename_component(APP_PATH ${CMAKE_INSTALL_PREFIX} PATH)
execute_process(
- COMMAND find /usr/local/Cellar/icu4c -name pkgconfig
- RESULT_VARIABLE CMD_ERROR
- OUTPUT_VARIABLE CONFIG_ICU)
+ COMMAND find ${HOMEBREW_PREFIX}/Cellar/icu4c -name pkgconfig
+ RESULT_VARIABLE CMD_ERROR
+ OUTPUT_VARIABLE CONFIG_ICU)
set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${CONFIG_ICU}")
find_package(PkgConfig)
pkg_check_modules(ICU icu-uc)
execute_process(
- COMMAND find /usr/local/Cellar/nglib -name MacOS
- OUTPUT_VARIABLE CONFIG_NGLIB)
+ COMMAND find ${HOMEBREW_PREFIX}/Cellar/[email protected] -name MacOS
+ OUTPUT_VARIABLE CONFIG_NGLIB)
install(CODE
"message(STATUS \"Making bundle relocatable...\")
@@ -130,6 +130,6 @@ install(CODE
execute_process(
COMMAND python2.7
${CMAKE_SOURCE_DIR}/src/Tools/MakeMacBundleRelocatable.py
- ${APP_PATH} ${HOMEBREW_PREFIX}${MACPORTS_PREFIX}/lib ${ICU_PREFIX}/lib/ /usr/local/opt ${CONFIG_NGLIB} ${Qt5Core_DIR}/../../.. ${XCTEST_PATH} ${WEBKIT_FRAMEWORK_DIR}
+ ${APP_PATH} /usr/lib ${HOMEBREW_PREFIX}${MACPORTS_PREFIX}/lib ${HOMEBREW_PREFIX}/opt/llvm@11/lib ${HOMEBREW_PREFIX}/opt/[email protected]/lib/ ${HOMEBREW_PREFIX}/Cellar/icu4c/69.1/lib/ ${CONFIG_NGLIB} ${HOMEBREW_PREFIX}/opt ${HOMEBREW_PREFIX}/opt/[email protected]/lib ${Qt5Core_DIR}/../../.. ${XCTEST_PATH} ${WEBKIT_FRAMEWORK_DIR}
)"
)
@ipatch
Copy link
Author

ipatch commented Dec 3, 2021

this patch is intended to aid in building a working macos FreeCAD.app bundle using brew install freecad/freecad/freecad

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment