diff --git a/validate_special_target.cmake b/validate_special_target.cmake index a00c713..638e3d7 100644 --- a/validate_special_target.cmake +++ b/validate_special_target.cmake @@ -6,16 +6,19 @@ set(DESKTOP_APP_SPECIAL_TARGET "" CACHE STRING "Use special platform target, like 'macstore' for Mac App Store.") +option(DESKTOP_APP_QT6 "Build with Qt 6" OFF) + function(report_bad_special_target) if (NOT DESKTOP_APP_SPECIAL_TARGET STREQUAL "") message(FATAL_ERROR "Bad special target '${DESKTOP_APP_SPECIAL_TARGET}'") endif() endfunction() -if (NOT DESKTOP_APP_SPECIAL_TARGET STREQUAL "osx") - set(CMAKE_OSX_DEPLOYMENT_TARGET 10.12 CACHE STRING "Minimum OS X deployment version" FORCE) +set(CMAKE_OSX_DEPLOYMENT_TARGET 10.12 CACHE STRING "Minimum macOS deployment version" FORCE) +if (DESKTOP_APP_QT6) + set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64" CACHE STRING "Target macOS architectures" FORCE) else() - set(CMAKE_OSX_DEPLOYMENT_TARGET 10.10 CACHE STRING "Minimum OS X deployment version" FORCE) + set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE STRING "Target macOS architectures" FORCE) endif() if (WIN32) diff --git a/variables.cmake b/variables.cmake index 23c38b8..08b5bd9 100644 --- a/variables.cmake +++ b/variables.cmake @@ -32,7 +32,6 @@ option(DESKTOP_APP_DISABLE_AUTOUPDATE "Disable autoupdate." ${disable_autoupdate option(DESKTOP_APP_USE_HUNSPELL_ONLY "Disable system spellchecker and use bundled Hunspell only. (For debugging purposes)" OFF) option(DESKTOP_APP_USE_ENCHANT "Use Enchant instead of bundled Hunspell. (Linux only)" OFF) option(DESKTOP_APP_NO_PDB "Disable PDB file generation. (Windows only)" OFF) -option(DESKTOP_APP_QT6 "Build with Qt 6" OFF) set(dont_bundle_fonts 0) if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY)