kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

Accept CMAKE_OSX_ARCHITECTURES from command line.

Browse source
This commit is contained in:
John Preston 2021-10-27 10:37:14 +04:00
parent 33799d3d6c
commit c0c09baa35
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
run_cmake.py
View file

@ -44,7 +44,7 @@ def run(project, arguments, buildType=''):
cmake.append('-DDESKTOP_APP_SPECIAL_TARGET=' + target) cmake.append('-DDESKTOP_APP_SPECIAL_TARGET=' + target)
cmake.extend(['-Werror=dev', '-Werror=deprecated', '--warn-uninitialized', '..' if not buildType else '../..']) cmake.extend(['-Werror=dev', '-Werror=deprecated', '--warn-uninitialized', '..' if not buildType else '../..'])
command = ' '.join(cmake) command = '"' + '" "'.join(cmake) + '"'
if not os.path.exists(basePath): if not os.path.exists(basePath):
os.makedirs(basePath) os.makedirs(basePath)

4
validate_special_target.cmake
View file

@ -15,9 +15,7 @@ function(report_bad_special_target)
endfunction() endfunction()
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.12 CACHE STRING "Minimum macOS deployment version" FORCE) set(CMAKE_OSX_DEPLOYMENT_TARGET 10.12 CACHE STRING "Minimum macOS deployment version" FORCE)
if (DESKTOP_APP_QT6) if (NOT DESKTOP_APP_QT6)
set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64" CACHE STRING "Target macOS architectures" FORCE)
else()
set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE STRING "Target macOS architectures" FORCE) set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE STRING "Target macOS architectures" FORCE)
endif() endif()