From 20b29eeb22f86d7aab223ac3d116e4e600e0c939 Mon Sep 17 00:00:00 2001 From: Mooneer Salem Date: Sun, 2 Aug 2020 00:15:14 -0700 Subject: [PATCH 1/3] Build universal ARM64/x86_64 binary on macOS. --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 157eef4..94e7856 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,9 @@ mark_as_advanced(CLEAR CMAKE_INSTALL_LIBDIR ) +# Build universal ARM64 and x86_64 binaries on Mac. +set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64e") + # # Prevent in-source builds # If an in-source build is attempted, you will still need to clean up a few From 31453bd5d47f56fdd230b298b3dbdcab451135fc Mon Sep 17 00:00:00 2001 From: Mooneer Salem Date: Sun, 9 Aug 2020 17:48:44 -0700 Subject: [PATCH 2/3] Replace arm64e->arm64. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 94e7856..3051ce0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,7 @@ mark_as_advanced(CLEAR ) # Build universal ARM64 and x86_64 binaries on Mac. -set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64e") +set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64") # # Prevent in-source builds From 6facf74c25fb2a6f427c8bac1edeefc5db08e8d1 Mon Sep 17 00:00:00 2001 From: Mooneer Salem Date: Sun, 15 Nov 2020 14:18:59 -0800 Subject: [PATCH 3/3] Require explicit -DBUILD_OSX_UNIVERSAL to build universal binaries. --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3051ce0..ba70f53 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,9 @@ mark_as_advanced(CLEAR ) # Build universal ARM64 and x86_64 binaries on Mac. +if(BUILD_OSX_UNIVERSAL) set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64") +endif(BUILD_OSX_UNIVERSAL) # # Prevent in-source builds