From da42b96d8e850f5469bdb3c58095071c690bdd70 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Fri, 10 Dec 2021 21:54:52 +0400 Subject: [PATCH 1/2] fixup! Force mac architecture and deployment target only in non-packaged builds Fix inverted condition --- variables.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variables.cmake b/variables.cmake index 902e9af..c24c9ab 100644 --- a/variables.cmake +++ b/variables.cmake @@ -31,7 +31,7 @@ option(DESKTOP_APP_USE_HUNSPELL_ONLY "Disable system spellchecker and use bundle 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) -if (NOT DESKTOP_APP_USE_PACKAGED) +if (DESKTOP_APP_USE_PACKAGED) set(DESKTOP_APP_MAC_ARCH "${CMAKE_OSX_ARCHITECTURES}" CACHE STRING "Target macOS arch. (macOS only)") else() set(DESKTOP_APP_MAC_ARCH "x86_64;arm64" CACHE STRING "Target macOS arch. (macOS only)") From 651362c922f0cb18cde6370c0011e1d9ca363772 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sun, 12 Dec 2021 11:49:05 +0400 Subject: [PATCH 2/2] Check whether CMAKE_OSX_ARCHITECTURES is initialized before using it --- variables.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variables.cmake b/variables.cmake index c24c9ab..fc4ff6c 100644 --- a/variables.cmake +++ b/variables.cmake @@ -31,7 +31,7 @@ option(DESKTOP_APP_USE_HUNSPELL_ONLY "Disable system spellchecker and use bundle 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) -if (DESKTOP_APP_USE_PACKAGED) +if (DESKTOP_APP_USE_PACKAGED AND DEFINED CMAKE_OSX_ARCHITECTURES) set(DESKTOP_APP_MAC_ARCH "${CMAKE_OSX_ARCHITECTURES}" CACHE STRING "Target macOS arch. (macOS only)") else() set(DESKTOP_APP_MAC_ARCH "x86_64;arm64" CACHE STRING "Target macOS arch. (macOS only)")