Fix packaging on Mac OS X.

This commit is contained in:
Ghislain MARY 2017-02-17 11:28:56 +01:00
parent 854bddd892
commit 15b3239eea
2 changed files with 1 additions and 2 deletions

View file

@ -225,8 +225,8 @@ elseif(APPLE)
install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/Linphone.app" DESTINATION "." USE_SOURCE_PERMISSIONS)
install(DIRECTORY "${LINPHONE_OUTPUT_DIR}/lib/mediastreamer" DESTINATION "Linphone.app/Contents/Resources/lib" USE_SOURCE_PERMISSIONS)
install(DIRECTORY "${LINPHONE_OUTPUT_DIR}/share/images" DESTINATION "Linphone.app/Contents/Resources/share" USE_SOURCE_PERMISSIONS)
install(DIRECTORY "${LINPHONE_OUTPUT_DIR}/share/Linphone/rootca.pem" DESTINATION "Linphone.app/Contents/Resources/share/linphone" USE_SOURCE_PERMISSIONS)
install(DIRECTORY "${LINPHONE_OUTPUT_DIR}/share/sounds" DESTINATION "Linphone.app/Contents/Resources/share" USE_SOURCE_PERMISSIONS)
install(FILES "${LINPHONE_OUTPUT_DIR}/share/Linphone/rootca.pem" DESTINATION "Linphone.app/Contents/Resources/share/linphone")
configure_file("MacPackaging.cmake.in" "MacPackaging.cmake" @ONLY)
install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/MacPackaging.cmake")

View file

@ -48,7 +48,6 @@ class DesktopTarget(prepare.Target):
self.output = 'OUTPUT/' + self.name
self.external_source_path = os.path.join(current_path, 'submodules')
self.packaging_args = [
"-DCMAKE_SKIP_INSTALL_RPATH=YES",
"-DENABLE_RELATIVE_PREFIX=YES"
]
external_builders_path = os.path.join(current_path, 'cmake_builder')