From c0c09baa3563980602ab98dcc21fe1d1b58ee4a8 Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 27 Oct 2021 10:37:14 +0400 Subject: [PATCH] Accept CMAKE_OSX_ARCHITECTURES from command line. --- run_cmake.py | 2 +- validate_special_target.cmake | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/run_cmake.py b/run_cmake.py index ca0ad66..c73495f 100644 --- a/run_cmake.py +++ b/run_cmake.py @@ -44,7 +44,7 @@ def run(project, arguments, buildType=''): cmake.append('-DDESKTOP_APP_SPECIAL_TARGET=' + target) cmake.extend(['-Werror=dev', '-Werror=deprecated', '--warn-uninitialized', '..' if not buildType else '../..']) - command = ' '.join(cmake) + command = '"' + '" "'.join(cmake) + '"' if not os.path.exists(basePath): os.makedirs(basePath) diff --git a/validate_special_target.cmake b/validate_special_target.cmake index 638e3d7..f527262 100644 --- a/validate_special_target.cmake +++ b/validate_special_target.cmake @@ -15,9 +15,7 @@ function(report_bad_special_target) endfunction() 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() +if (NOT DESKTOP_APP_QT6) set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE STRING "Target macOS architectures" FORCE) endif()