diff --git a/CMakeLists.txt b/CMakeLists.txt index 239a6a7..0699a46 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/osx/Info.plist b/osx/Info.plist index 14328ba..6dd646e 100644 --- a/osx/Info.plist +++ b/osx/Info.plist @@ -54,13 +54,12 @@ NSAllowsArbitraryLoads + NSHighResolutionCapable + NSCameraUsageDescription vimix needs to access the camera to enable camera sources. - NSHighResolutionCapable NSMicrophoneUsageDescription vimix needs to access the microphone to enable sound sources. - NSMicrophoneUsageDescription - NSHumanReadableCopyright Copyright © 2022 Bruno Herbelin. All rights reserved. NSPrincipalClass diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b1a2dbd..5d2926a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -170,10 +170,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 @@ -242,7 +238,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 )