[Bf-blender-cvs] [b2424bd781a] soc-2019-openxr: Windows: Print warning and disable `WITH_OPENXR` if SDK is not found
Julian Eisel
noreply at git.blender.org
Mon Aug 19 15:42:15 CEST 2019
Commit: b2424bd781a582d9a83b2c3013f632d17ec452d5
Author: Julian Eisel
Date: Mon Aug 19 15:41:27 2019 +0200
Branches: soc-2019-openxr
https://developer.blender.org/rBb2424bd781a582d9a83b2c3013f632d17ec452d5
Windows: Print warning and disable `WITH_OPENXR` if SDK is not found
===================================================================
M build_files/cmake/platform/platform_win32.cmake
===================================================================
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake
index f16dad63b5a..32a0dd1e383 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -693,8 +693,13 @@ if(WINDOWS_PYTHON_DEBUG)
endif()
if(WITH_OPENXR)
- set(OPENXR_SDK ${LIBDIR}/openxr_sdk)
- set(OPENXR_SDK_LIBPATH ${LIBDIR}/openxr_sdk/lib)
- set(OPENXR_SDK_INCLUDE_DIRS ${OPENXR_SDK}/include)
- set(OPENXR_SDK_LIBRARIES ${OPENXR_SDK_LIBPATH}/openxr_loader-1_0.lib)
+ if(EXISTS ${LIBDIR}/openxr_sdk)
+ set(OPENXR_SDK ${LIBDIR}/openxr_sdk)
+ set(OPENXR_SDK_LIBPATH ${LIBDIR}/openxr_sdk/lib)
+ set(OPENXR_SDK_INCLUDE_DIRS ${OPENXR_SDK}/include)
+ set(OPENXR_SDK_LIBRARIES ${OPENXR_SDK_LIBPATH}/openxr_loader-1_0.lib)
+ else()
+ message(WARNING "OpenXR-SDK was not found, disabling WITH_OPENXR")
+ set(WITH_OPENXR OFF)
+ endif()
endif()
More information about the Bf-blender-cvs
mailing list