From f1df8ead68c833d0f8bdfaaf0aaf8793c3cfec38 Mon Sep 17 00:00:00 2001 From: bsongis Date: Sun, 26 Jul 2015 12:37:50 +0200 Subject: [PATCH] [OSX] It should not be needed to manually copy SDL into the bundle now --- companion/src/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt index 2d3c2d8a7..6816f5d1f 100644 --- a/companion/src/CMakeLists.txt +++ b/companion/src/CMakeLists.txt @@ -391,7 +391,7 @@ IF( WIN32 ) ENDIF( ) IF( APPLE ) - SET(MACOSX_BUNDLE_ICON_FILE iconmac.icns) + SET(MACOSX_BUNDLE_ICON_FILE iconmac.icns) IF( CMAKE_GENERATOR STREQUAL Xcode ) SET( WORK_DIR ${CMAKE_BINARY_DIR}/Debug ) ELSE( ) @@ -403,15 +403,15 @@ IF( APPLE ) COMMAND mkdir -p companion.app/Contents/Resources COMMAND mkdir -p companion.app/Contents/translations COMMAND rsync ${PROJECT_SOURCE_DIR}/images/${MACOSX_BUNDLE_ICON_FILE} companion.app/Contents/Resources/${MACOSX_BUNDLE_ICON_FILE} # Copy the icon files - #COMMAND rsync ${PROJECT_SOURCE_DIR}/../targets/mac/lib* companion.app/Contents/Frameworks - #COMMAND rsync ${PROJECT_SOURCE_DIR}/../targets/mac/libcrypto.1.0.0.dylib companion.app/Contents/Frameworks COMMAND rsync -r --exclude=.svn ${PROJECT_SOURCE_DIR}/../targets/mac/qt_menu.nib companion.app/Contents/Resources/ COMMAND rsync ${PROJECT_BINARY_DIR}/*.qm companion.app/Contents/translations + COMMAND rsync ${PROJECT_BINARY_DIR}/*.qm companion.app/Contents/translations + COMMAND cp -pR /Library/Frameworks/SDL.framework companion.app/Contents/Frameworks/ COMMAND ${QT_BINARY_DIR}/macdeployqt companion.app + install_name_tool -change @rpath/SDL.framework/Versions/A/SDL @executable_path/../Frameworks/SDL.framework/Versions/A/SDL companion.app/Contents/MacOS/companion WORKING_DIRECTORY ${WORK_DIR} DEPENDS ${COMPANION_NAME} ) - ADD_CUSTOM_TARGET( makedmg COMMAND ${QT_BINARY_DIR}/macdeployqt companion.app -dmg -no-plugins WORKING_DIRECTORY ${WORK_DIR}