Run install_name_tool on all dylib files
This commit is contained in:
@@ -398,7 +398,7 @@ IF( APPLE )
|
|||||||
SET( WORK_DIR ${PROJECT_BINARY_DIR} )
|
SET( WORK_DIR ${PROJECT_BINARY_DIR} )
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
ADD_CUSTOM_TARGET( addframeworks ALL
|
ADD_CUSTOM_TARGET( addframeworks
|
||||||
COMMAND mkdir -p companion.app/Contents/Frameworks
|
COMMAND mkdir -p companion.app/Contents/Frameworks
|
||||||
COMMAND mkdir -p companion.app/Contents/Resources
|
COMMAND mkdir -p companion.app/Contents/Resources
|
||||||
COMMAND mkdir -p companion.app/Contents/translations
|
COMMAND mkdir -p companion.app/Contents/translations
|
||||||
@@ -408,7 +408,8 @@ 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 /Library/Frameworks/SDL.framework companion.app/Contents/Frameworks/
|
COMMAND rsync -r /Library/Frameworks/SDL.framework companion.app/Contents/Frameworks/
|
||||||
COMMAND ${QT_BINARY_DIR}/macdeployqt companion.app
|
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
|
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}
|
WORKING_DIRECTORY ${WORK_DIR}
|
||||||
DEPENDS ${COMPANION_NAME} )
|
DEPENDS ${COMPANION_NAME} )
|
||||||
|
|
||||||
@@ -416,7 +417,6 @@ IF( APPLE )
|
|||||||
COMMAND ${QT_BINARY_DIR}/macdeployqt companion.app -dmg -no-plugins
|
COMMAND ${QT_BINARY_DIR}/macdeployqt companion.app -dmg -no-plugins
|
||||||
WORKING_DIRECTORY ${WORK_DIR}
|
WORKING_DIRECTORY ${WORK_DIR}
|
||||||
DEPENDS addframeworks )
|
DEPENDS addframeworks )
|
||||||
|
|
||||||
ENDIF( )
|
ENDIF( )
|
||||||
|
|
||||||
ADD_CUSTOM_TARGET( stamp
|
ADD_CUSTOM_TARGET( stamp
|
||||||
|
|||||||
@@ -167,3 +167,22 @@ target_link_libraries(opentx-taranisx9e${SUFFIX}-simulator PRIVATE ${COMMON_LIBR
|
|||||||
add_custom_target(opentx-simulators
|
add_custom_target(opentx-simulators
|
||||||
DEPENDS ${OPENTX_LIBRARIES}
|
DEPENDS ${OPENTX_LIBRARIES}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if(APPLE)
|
||||||
|
set(SIMULATOR_BUNDLES)
|
||||||
|
foreach(_file ${OPENTX_LIBRARIES})
|
||||||
|
set(SIMULATOR_BUNDLE "${_file}-bundle")
|
||||||
|
add_custom_target(${SIMULATOR_BUNDLE}
|
||||||
|
COMMAND install_name_tool -change /opt/local/Library/Frameworks/QtCore.framework/Versions/4/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/4/QtCore lib${_file}.dylib
|
||||||
|
COMMAND install_name_tool -change /opt/local/Library/Frameworks/QtNetwork.framework/Versions/4/QtNetwork @executable_path/../Frameworks/QtNetwork.framework/Versions/4/QtNetwork lib${_file}.dylib
|
||||||
|
COMMAND install_name_tool -change /opt/local/Library/Frameworks/QtXml.framework/Versions/4/QtXml @executable_path/../Frameworks/QtXml.framework/Versions/4/QtXml lib${_file}.dylib
|
||||||
|
COMMAND install_name_tool -change /opt/local/Library/Frameworks/QtGui.framework/Versions/4/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/4/QtGui lib${_file}.dylib
|
||||||
|
COMMAND install_name_tool -change @rpath/SDL.framework/Versions/A/SDL @executable_path/../Frameworks/SDL.framework/Versions/A/SDL lib${_file}.dylib
|
||||||
|
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
|
||||||
|
DEPENDS ${_file}
|
||||||
|
)
|
||||||
|
list(APPEND SIMULATOR_BUNDLES ${SIMULATOR_BUNDLE})
|
||||||
|
endforeach()
|
||||||
|
add_custom_target(opentx-simulators-bundle DEPENDS ${SIMULATOR_BUNDLES})
|
||||||
|
endif(APPLE)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user