From 15b3239eeaa8242f61ca425fd82c1a1377f1cf0d Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 17 Feb 2017 11:28:56 +0100 Subject: [PATCH] Fix packaging on Mac OS X. --- cmake_builder/linphone_package/CMakeLists.txt | 2 +- prepare.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/cmake_builder/linphone_package/CMakeLists.txt b/cmake_builder/linphone_package/CMakeLists.txt index 7043e0195..372f203b4 100644 --- a/cmake_builder/linphone_package/CMakeLists.txt +++ b/cmake_builder/linphone_package/CMakeLists.txt @@ -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") diff --git a/prepare.py b/prepare.py index bdd42b331..316ee080b 100755 --- a/prepare.py +++ b/prepare.py @@ -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')