diff --git a/CMakeLists.txt b/CMakeLists.txt index ebecbfb47..97306c443 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,9 @@ cmake_minimum_required(VERSION 3.13) +if(APPLE) + # Set this to the operating system version you're building on, and also update + # es-app/assets/EmulationStation-DE_Info.plist accordingly. + set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14" CACHE STRING "macOS deployment target") +endif() project(emulationstation-de) # Set this to ON to show verbose compiler output (e.g. compiler flags, include directories etc.) @@ -157,8 +162,8 @@ if(APPLE) endif() if(APPLE) - if(${CMAKE_OSX_DEPLOYMENT_TARGET} VERSION_GREATER 10.13) - message("-- macOS version 10.14 or higher detected so if code signing is enabled, Hardened Runtime will be used") + if(${CMAKE_OSX_DEPLOYMENT_TARGET} VERSION_LESS 10.14) + message("-- macOS version 10.13 or lower has been set, so if code signing is enabled, Hardened Runtime will not be used") endif() endif() diff --git a/es-app/CMakeLists.txt b/es-app/CMakeLists.txt index b402b77fd..c75125b68 100644 --- a/es-app/CMakeLists.txt +++ b/es-app/CMakeLists.txt @@ -244,9 +244,14 @@ endif() # Settings per operating system and generator type. if(APPLE) set(CPACK_GENERATOR "Bundle") - set(CPACK_PACKAGE_FILE_NAME "EmulationStation-DE-${CPACK_PACKAGE_VERSION}-${CPU_ARCHITECTURE}") + if(${CMAKE_OSX_DEPLOYMENT_TARGET} VERSION_LESS 10.14) + set(CPACK_PACKAGE_FILE_NAME "EmulationStation-DE-${CPACK_PACKAGE_VERSION}-${CPU_ARCHITECTURE}_legacy") + set(CPACK_DMG_VOLUME_NAME "EmulationStation Desktop Edition ${CPACK_PACKAGE_VERSION}_legacy") + else() + set(CPACK_PACKAGE_FILE_NAME "EmulationStation-DE-${CPACK_PACKAGE_VERSION}-${CPU_ARCHITECTURE}") + set(CPACK_DMG_VOLUME_NAME "EmulationStation Desktop Edition ${CPACK_PACKAGE_VERSION}") + endif() set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/assets/EmulationStation-DE.icns") - set(CPACK_DMG_VOLUME_NAME "EmulationStation Desktop Edition ${CPACK_PACKAGE_VERSION}") set(CPACK_DMG_DS_STORE "${CMAKE_CURRENT_SOURCE_DIR}/assets/EmulationStation-DE_DS_Store") set(CPACK_BUNDLE_NAME "EmulationStation Desktop Edition") set(CPACK_BUNDLE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/assets/EmulationStation-DE.icns") diff --git a/es-app/assets/EmulationStation-DE_Info.plist b/es-app/assets/EmulationStation-DE_Info.plist index aff322fd0..2c928afd9 100644 --- a/es-app/assets/EmulationStation-DE_Info.plist +++ b/es-app/assets/EmulationStation-DE_Info.plist @@ -21,7 +21,7 @@ CFBundleVersion 1.0.0-rc LSMinimumSystemVersion - 10.11.0 + 10.14.0 LSUIPresentationMode 3 NSHighResolutionCapable