Merge pull request #16 from leapmotion/fix-osxforce

CMAKE_OSX_ARCHITECTURES must be set with FORCE
leapmotion · Sep 12, 2016 · 8219036 · 8219036
2 parents 3a3d0e2 + 62177a4
commit 8219036
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/standard/StandardProject.cmake b/standard/StandardProject.cmake
@@ -37,12 +37,12 @@ endmacro()
 function(standard_project_preinit)
   # Pre-initialization steps - these variables must be set before the first call to
   # project()
-  if(APPLE)
+  if(APPLE AND CMAKE_OSX_ARCHITECTURES STREQUAL "")
     if(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm")
-      set(CMAKE_OSX_ARCHITECTURES "arm" CACHE STRING "Mac OS X build architectures")
+      set(CMAKE_OSX_ARCHITECTURES "arm" CACHE STRING "Mac OS X build architectures" FORCE)
     else()
       # Build Fat binaries on OSX by default
-      set(CMAKE_OSX_ARCHITECTURES "x86_64;i386" CACHE STRING "Mac OS X build architectures")
+      set(CMAKE_OSX_ARCHITECTURES "x86_64;i386" CACHE STRING "Mac OS X build architectures" FORCE)
     endif()
   endif()