diff --git a/.travis/script.sh b/.travis/script.sh index 9afa8e615..defeda5b2 100644 --- a/.travis/script.sh +++ b/.travis/script.sh @@ -29,6 +29,9 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then wget -c -nv https://github.com/arl/macdeployqtfix/raw/master/macdeployqtfix.py python2 macdeployqtfix.py $BUNDLE_NAME/Contents/MacOS/Olive /usr/local/Cellar/qt5/5.*/ + # Fix deps on crash handler + python2 macdeployqtfix.py $BUNDLE_NAME/Contents/MacOS/olive-crashhandler /usr/local/Cellar/qt5/5.*/ + # Fix OpenEXR libs that seem to be missed by both macdeployqt _and_ macdeployqtfix cd $BUNDLE_NAME/Contents/Frameworks exrlib=(libImath-*.dylib libHalf-*.dylib libIexMath-*.dylib libIex-*.dylib libIlmThread-*.dylib) diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 0c5b1fa10..4cc08827f 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -205,4 +205,7 @@ endif() if(APPLE) # Move crash handler program inside Mac app bundle + add_custom_command(TARGET ${OLIVE_CRASH_TARGET} POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy ${OLIVE_CRASH_TARGET} $ + ) endif()