[Bf-blender-cvs] [5aedfd12cd7] vr_scene_inspection: Remove old files/changes, git keeps bringing them back...

[Julian Eisel]

Commit: 5aedfd12cd7d58f7cd01c4d75a39fcdcb194b08c
Author: Julian Eisel
Date:   Tue Mar 10 16:11:44 2020 +0100
Branches: vr_scene_inspection
https://developer.blender.org/rB5aedfd12cd7d58f7cd01c4d75a39fcdcb194b08c

Remove old files/changes, git keeps bringing them back...

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

D	build_files/build_environment/cmake/openxr.cmake
D	build_files/cmake/Modules/FindOpenXR-SDK.cmake
M	build_files/cmake/platform/platform_apple.cmake

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

diff --git a/build_files/build_environment/cmake/openxr.cmake b/build_files/build_environment/cmake/openxr.cmake
deleted file mode 100644
index c0edb37c184..00000000000
--- a/build_files/build_environment/cmake/openxr.cmake
+++ /dev/null
@@ -1,58 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-
-# Keep flags in sync with install_deps.sh ones in compile_OpenXR_SDK()
-set(OPENXR_SDK_EXTRA_ARGS
-  -DBUILD_FORCE_GENERATION=OFF
-  -DBUILD_LOADER=ON
-  -DDYNAMIC_LOADER=OFF
-)
-
-if(UNIX AND NOT APPLE)
-  list(APPEND OPENXR_SDK_EXTRA_ARGS
-    -DBUILD_WITH_WAYLAND_HEADERS=OFF
-    -DBUILD_WITH_XCB_HEADERS=OFF
-    -DBUILD_WITH_XLIB_HEADERS=ON
-  )
-endif()
-
-ExternalProject_Add(external_openxr_sdk
-  URL ${OPENXR_SDK_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${OPENXR_SDK_HASH}
-  PREFIX ${BUILD_DIR}/openxr_sdk
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openxr_sdk ${DEFAULT_CMAKE_FLAGS} ${OPENXR_SDK_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/openxr_sdk
-)
-
-if(WIN32)
-  if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_openxr_sdk after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openxr_sdk/include/openxr ${HARVEST_TARGET}/openxr_sdk/include/openxr
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openxr_sdk/lib ${HARVEST_TARGET}/openxr_sdk/lib
-      DEPENDEES install
-    )
-  endif()
-  if(BUILD_MODE STREQUAL Debug)
-    ExternalProject_Add_Step(external_openxr_sdk after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openxr_sdk/lib/openxr_loader.lib ${HARVEST_TARGET}/openxr_sdk/lib/openxr_loader_d.lib
-      DEPENDEES install
-    )
-  endif()
-endif()
diff --git a/build_files/cmake/Modules/FindOpenXR-SDK.cmake b/build_files/cmake/Modules/FindOpenXR-SDK.cmake
deleted file mode 100644
index 7549db2a88a..00000000000
--- a/build_files/cmake/Modules/FindOpenXR-SDK.cmake
+++ /dev/null
@@ -1,66 +0,0 @@
-# - Find OpenXR-SDK library
-# Find the native OpenXR-SDK includes and library
-# This module defines
-#  OPENXR_SDK_INCLUDE_DIRS, where to find OpenXR-SDK headers, Set when
-#                           OPENXR_SDK_INCLUDE_DIR is found.
-#  OPENXR_SDK_LIBRARIES, libraries to link against to use OpenXR-SDK.
-#  OPENXR_SDK_ROOT_DIR, the base directory to search for OpenXR-SDK.
-#                        This can also be an environment variable.
-#  OPENXR_SDK_FOUND, if false, do not try to use OpenXR-SDK.
-#
-# also defined, but not for general use are
-#  OPENXR_LOADER_LIBRARY, where to find the OpenXR-SDK library.
-
-#=============================================================================
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-
-# If OPENXR_SDK_ROOT_DIR was defined in the environment, use it.
-IF(NOT OPENXR_SDK_ROOT_DIR AND NOT $ENV{OPENXR_SDK_ROOT_DIR} STREQUAL "")
-  SET(OPENXR_SDK_ROOT_DIR $ENV{OPENXR_SDK_ROOT_DIR})
-ENDIF()
-
-SET(_openxr_sdk_SEARCH_DIRS
-  ${OPENXR_SDK_ROOT_DIR}
-  /usr/local
-  /opt/lib/openxr-sdk
-)
-
-FIND_PATH(OPENXR_SDK_INCLUDE_DIR
-  NAMES
-    openxr/openxr.h
-  HINTS
-    ${_openxr_sdk_SEARCH_DIRS}
-  PATH_SUFFIXES
-    include
-)
-
-FIND_LIBRARY(OPENXR_LOADER_LIBRARY
-  NAMES
-    openxr_loader
-  HINTS
-    ${_openxr_sdk_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib
-)
-
-# handle the QUIETLY and REQUIRED arguments and set OPENXR_SDK_FOUND to TRUE if
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENXR_SDK DEFAULT_MSG
-    OPENXR_LOADER_LIBRARY OPENXR_SDK_INCLUDE_DIR)
-
-IF(OPENXR_SDK_FOUND)
-  SET(OPENXR_SDK_LIBRARIES ${OPENXR_LOADER_LIBRARY})
-  SET(OPENXR_SDK_INCLUDE_DIRS ${OPENXR_SDK_INCLUDE_DIR})
-ENDIF(OPENXR_SDK_FOUND)
-
-MARK_AS_ADVANCED(
-  OPENXR_SDK_INCLUDE_DIR
-  OPENXR_LOADER_LIBRARY
-)
diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
index da1d4997707..11889fc7a87 100644
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@ -429,14 +429,6 @@ if(WITH_XR_OPENXR)
   endif()
 endif()
 
-if(WITH_OPENXR)
-  find_package(OpenXR-SDK)
-  if(NOT OPENXR_SDK_FOUND)
-    message(WARNING "OpenXR-SDK was not found, disabling WITH_OPENXR")
-    set(WITH_OPENXR OFF)
-  endif()
-endif()
-
 set(EXETYPE MACOSX_BUNDLE)
 
 set(CMAKE_C_FLAGS_DEBUG "-fno-strict-aliasing -g")