From e7a8d48ccacb2fdb3ba08a5edaa9e0426a098d39 Mon Sep 17 00:00:00 2001 From: Bruno Date: Wed, 26 Oct 2022 09:44:10 +0200 Subject: [PATCH] Packaging fix (Cpack OSX) --- CMakeLists.txt | 3 +++ src/CMakeLists.txt | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b8797b8..fc5e193 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,6 +64,9 @@ if(UNIX) # CPACK set(CPACK_SYSTEM_NAME "OSX_${CMAKE_OSX_DEPLOYMENT_TARGET}_${CMAKE_OSX_ARCHITECTURES}") + set(CPACK_GENERATOR DragNDrop) + set(CPACK_BINARY_DRAGNDROP ON) + set(APPLE_CODESIGN_ENTITLEMENTS "${CMAKE_CURRENT_SOURCE_DIR}/osx/entitlements.plist") # find icu4c in OSX (pretty well hidden...) set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/opt/icu4c/lib/pkgconfig") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 724629f..0d0083c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -164,10 +164,6 @@ target_link_libraries(${VMIX_BINARY} LINK_PRIVATE IF(APPLE) - # Bundle target - set(CPACK_GENERATOR DragNDrop) - set(CPACK_BINARY_DRAGNDROP ON) - install(TARGETS ${VMIX_BINARY} CONFIGURATIONS Release RelWithDebInfo BUNDLE DESTINATION . COMPONENT Runtime @@ -236,7 +232,6 @@ IF(APPLE) COMPONENT Runtime ) - set(APPLE_CODESIGN_ENTITLEMENTS "${CMAKE_CURRENT_SOURCE_DIR}/osx/entitlements.plist") set(APPLE_CODESIGN_IDENTITY "" CACHE STRING "") string(LENGTH "${APPLE_CODESIGN_IDENTITY}" APPLE_CODESIGN_IDENTITY_LENGHT) if( ${APPLE_CODESIGN_IDENTITY_LENGHT} LESS 40 )