From a569c6737192d17e1849ff89f91ace888535a275 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Mon, 10 Aug 2015 01:08:56 +0200 Subject: [PATCH] Fixes #2678 --- companion/src/CMakeLists.txt | 1 + companion/src/firmwares/opentx/simulator/CMakeLists.txt | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt index bb150d278..c43e1a0eb 100644 --- a/companion/src/CMakeLists.txt +++ b/companion/src/CMakeLists.txt @@ -412,6 +412,7 @@ IF( APPLE ) COMMAND rsync ${PROJECT_BINARY_DIR}/*.qm companion.app/Contents/translations COMMAND rsync ${PROJECT_BINARY_DIR}/*.qm companion.app/Contents/translations COMMAND rsync -r ${XSD_INCLUDE_DIR}/.. companion.app/Contents/Frameworks/ + COMMAND rsync -r /Library/Frameworks/SDL.framework companion.app/Contents/Frameworks/ COMMAND ${QT_BINARY_DIR}/macdeployqt companion.app COMMAND 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} diff --git a/companion/src/firmwares/opentx/simulator/CMakeLists.txt b/companion/src/firmwares/opentx/simulator/CMakeLists.txt index 130fa0286..a1447d346 100644 --- a/companion/src/firmwares/opentx/simulator/CMakeLists.txt +++ b/companion/src/firmwares/opentx/simulator/CMakeLists.txt @@ -43,6 +43,11 @@ include_directories( ${RADIO_SRC_DIRECTORY}/thirdparty/Lua/src ) +if(APPLE) + # OS X compiler no longer automatically includes /Library/Frameworks in search path + set(CMAKE_SHARED_LINKER_FLAGS -F/Library/Frameworks) +endif(APPLE) + if(DEFINED TRANSLATIONS) set(COMMON_DEFINITIONS ${COMMON_DEFINITIONS} TRANSLATIONS_${TRANSLATIONS}) string(TOLOWER ${TRANSLATIONS} TRANSLATION_SUFFIX)