From 882ab59501e1d2e6940592169897deacefc452af Mon Sep 17 00:00:00 2001 From: Daniel 0xdbeef Zalega Date: Fri, 10 Dec 2021 13:40:15 +0100 Subject: [PATCH] Mac M1 adjustments to CMake build system --- CMakeLists.txt | 2 +- cmake_modules/FindSDL2.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4cb39d7b..4a91aac8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -130,7 +130,7 @@ endif(UNIX) if(CMAKE_SYSTEM_PROCESSOR MATCHES AMD|x86) set(VM_SRCS code/qcommon/vm_x86.c) -elseif(CMAKE_SYSTEM_PROCESSOR MATCHES aarch) +elseif(CMAKE_SYSTEM_PROCESSOR MATCHES aarch|arm64) set(VM_SRCS code/qcommon/vm_aarch64.c) elseif(CMAKE_SYSTEM_PROCESSOR MATCHES arm) set(VM_SRCS code/qcommon/vm_armv7l.c) diff --git a/cmake_modules/FindSDL2.cmake b/cmake_modules/FindSDL2.cmake index 25bd9009..cf1d6842 100644 --- a/cmake_modules/FindSDL2.cmake +++ b/cmake_modules/FindSDL2.cmake @@ -340,7 +340,7 @@ if(SDL2_FOUND) # For OS X, SDL2 uses Cocoa as a backend so it must link to Cocoa. # For more details, please see above. set_target_properties(SDL2::Core PROPERTIES - IMPORTED_LOCATION "${SDL2_LIBRARY}/SDL2" + IMPORTED_LOCATION "${SDL2_LIBRARY}" INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIR}") else() # For threads, as mentioned Apple doesn't need this.