[Bf-blender-cvs] [65ceb8ee5de] soc-2019-openxr: Don't attempt to force enable WITH_OPENXR on macOS

[Julian Eisel]

Commit: 65ceb8ee5de7d57418455e9a8489962df3ca807c
Author: Julian Eisel
Date:   Mon Mar 2 11:01:26 2020 +0100
Branches: soc-2019-openxr
https://developer.blender.org/rB65ceb8ee5de7d57418455e9a8489962df3ca807c

Don't attempt to force enable WITH_OPENXR on macOS

===================================================================

M	build_files/cmake/config/blender_full.cmake
M	build_files/cmake/config/blender_release.cmake

===================================================================

diff --git a/build_files/cmake/config/blender_full.cmake b/build_files/cmake/config/blender_full.cmake
index 34428fc0929..8a753ae29e6 100644
--- a/build_files/cmake/config/blender_full.cmake
+++ b/build_files/cmake/config/blender_full.cmake
@@ -38,7 +38,6 @@ set(WITH_OPENAL              ON  CACHE BOOL "" FORCE)
 set(WITH_OPENCOLLADA         ON  CACHE BOOL "" FORCE)
 set(WITH_OPENCOLORIO         ON  CACHE BOOL "" FORCE)
 set(WITH_OPENIMAGEDENOISE    ON  CACHE BOOL "" FORCE)
-set(WITH_OPENXR              ON  CACHE BOOL "" FORCE)
 set(WITH_OPENMP              ON  CACHE BOOL "" FORCE)
 set(WITH_OPENSUBDIV          ON  CACHE BOOL "" FORCE)
 set(WITH_OPENVDB             ON  CACHE BOOL "" FORCE)
@@ -62,3 +61,6 @@ if(UNIX AND NOT APPLE)
   set(WITH_X11_XINPUT          ON  CACHE BOOL "" FORCE)
   set(WITH_X11_XF86VMODE       ON  CACHE BOOL "" FORCE)
 endif()
+if(NOT APPLE)
+  set(WITH_OPENXR              ON  CACHE BOOL "" FORCE)
+endif()
diff --git a/build_files/cmake/config/blender_release.cmake b/build_files/cmake/config/blender_release.cmake
index f432435111f..7163e7970b2 100644
--- a/build_files/cmake/config/blender_release.cmake
+++ b/build_files/cmake/config/blender_release.cmake
@@ -39,7 +39,6 @@ set(WITH_OPENAL              ON  CACHE BOOL "" FORCE)
 set(WITH_OPENCOLLADA         ON  CACHE BOOL "" FORCE)
 set(WITH_OPENCOLORIO         ON  CACHE BOOL "" FORCE)
 set(WITH_OPENIMAGEDENOISE    ON  CACHE BOOL "" FORCE)
-set(WITH_OPENXR              ON  CACHE BOOL "" FORCE)
 set(WITH_OPENMP              ON  CACHE BOOL "" FORCE)
 set(WITH_OPENSUBDIV          ON  CACHE BOOL "" FORCE)
 set(WITH_OPENVDB             ON  CACHE BOOL "" FORCE)
@@ -66,3 +65,6 @@ if(UNIX AND NOT APPLE)
   set(WITH_X11_XINPUT          ON  CACHE BOOL "" FORCE)
   set(WITH_X11_XF86VMODE       ON  CACHE BOOL "" FORCE)
 endif()
+if(NOT APPLE)
+  set(WITH_OPENXR              ON  CACHE BOOL "" FORCE)
+endif()