[Bf-blender-cvs] [03ac9de0a9d] soc-2019-openxr: Remove XR defines from top-level CMakeLists file, can be done locally

Julian Eisel noreply at git.blender.org
Fri Nov 15 11:30:10 CET 2019


Commit: 03ac9de0a9dc3376a481b4ab0c8a647107d07eb7
Author: Julian Eisel
Date:   Thu Nov 14 12:01:06 2019 +0100
Branches: soc-2019-openxr
https://developer.blender.org/rB03ac9de0a9dc3376a481b4ab0c8a647107d07eb7

Remove XR defines from top-level CMakeLists file, can be done locally

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

M	CMakeLists.txt

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ce7c2a0107..ae0e3dd349e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1324,20 +1324,6 @@ if(WITH_LIBMV)
   set(CERES_DEFINES -DCERES_STD_UNORDERED_MAP)
 endif()
 
-#-----------------------------------------------------------------------------
-# Configure OpenXR
-# Adds some compiler defines as required by the OpenXR specification.
-
-if(WITH_OPENXR)
-  if(WIN32)
-    add_definitions(-DXR_USE_PLATFORM_WIN32 -DXR_USE_GRAPHICS_API_D3D11)
-  elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    add_definitions(-DXR_OS_LINUX -DXR_USE_PLATFORM_XLIB )
-  endif()
-
-  add_definitions(-DXR_USE_GRAPHICS_API_OPENGL)
-endif()
-
 #-----------------------------------------------------------------------------
 # Extra limits to number of jobs running in parallel for some kind os tasks.
 # Only supported by Ninja build system currently.



More information about the Bf-blender-cvs mailing list