[Bf-blender-cvs] [0c7ac28b8a9] soc-2019-openxr: SDK changed loader lib name on Windows, update for that

[Julian Eisel]

Commit: 0c7ac28b8a94e10cff18a893eb70d1690749163e
Author: Julian Eisel
Date:   Thu Nov 28 19:00:10 2019 +0100
Branches: soc-2019-openxr
https://developer.blender.org/rB0c7ac28b8a94e10cff18a893eb70d1690749163e

SDK changed loader lib name on Windows, update for that

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

M	build_files/build_environment/cmake/openxr.cmake
M	build_files/cmake/platform/platform_win32.cmake

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

diff --git a/build_files/build_environment/cmake/openxr.cmake b/build_files/build_environment/cmake/openxr.cmake
index 3b827683a14..965907c2ad4 100644
--- a/build_files/build_environment/cmake/openxr.cmake
+++ b/build_files/build_environment/cmake/openxr.cmake
@@ -42,7 +42,7 @@ if(WIN32)
   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-1_0.lib ${HARVEST_TARGET}/openxr_sdk/lib/openxr_loader-1_0_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openxr_sdk/lib/openxr_loader.lib ${HARVEST_TARGET}/openxr_sdk/lib/openxr_loader_d.lib
       DEPENDEES install
     )
   endif()
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake
index 8a93b68e38f..a5c58e3caf0 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -698,9 +698,9 @@ endif()
 if(WITH_OPENXR)
   if(EXISTS ${LIBDIR}/openxr_sdk)
     set(OPENXR_SDK ${LIBDIR}/openxr_sdk)
-    set(OPENXR_SDK_LIBPATH ${LIBDIR}/openxr_sdk/lib)
+    set(OPENXR_SDK_LIBPATH ${OPENXR_SDK}/lib)
     set(OPENXR_SDK_INCLUDE_DIR ${OPENXR_SDK}/include)
-    set(OPENXR_SDK_LIBRARIES optimized ${OPENXR_SDK_LIBPATH}/openxr_loader-1_0.lib debug ${OPENXR_SDK_LIBPATH}/openxr_loader-1_0_d.lib)
+    set(OPENXR_SDK_LIBRARIES optimized ${OPENXR_SDK_LIBPATH}/openxr_loader.lib debug ${OPENXR_SDK_LIBPATH}/openxr_loader_d.lib)
   else()
     message(WARNING "OpenXR-SDK was not found, disabling WITH_OPENXR")
     set(WITH_OPENXR OFF)