[Bf-blender-cvs] [dd0fcb50b4b] soc-2019-openxr: Fix compile errors on windows and with bundled OpenXR SDK sources

[Julian Eisel]

Commit: dd0fcb50b4b637e70e8fc8e81187c8d22cb4b127
Author: Julian Eisel
Date:   Thu Jul 11 00:50:10 2019 +0200
Branches: soc-2019-openxr
https://developer.blender.org/rBdd0fcb50b4b637e70e8fc8e81187c8d22cb4b127

Fix compile errors on windows and with bundled OpenXR SDK sources

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

M	extern/openxr/CMakeLists.txt
M	intern/ghost/CMakeLists.txt
M	intern/ghost/intern/GHOST_XrContext.cpp

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

diff --git a/extern/openxr/CMakeLists.txt b/extern/openxr/CMakeLists.txt
index c2c223f7fdc..eecf91df6a6 100644
--- a/extern/openxr/CMakeLists.txt
+++ b/extern/openxr/CMakeLists.txt
@@ -20,6 +20,8 @@
 set(MAJOR 0)
 set(MINOR 90)
 
+include(xr_platform_defines)
+
 include(CheckFunctionExists)
 CHECK_FUNCTION_EXISTS(secure_getenv HAVE_SECURE_GETENV)
 CHECK_FUNCTION_EXISTS(__secure_getenv HAVE___SECURE_GETENV)
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index 8661e10f3a1..cc3cb3de7ca 100644
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -355,6 +355,7 @@ if(WITH_OPENXR)
     intern/GHOST_XrGraphicsBinding.cpp
     intern/GHOST_XrSession.cpp
 
+    GHOST_IXrContext.h
     intern/GHOST_Xr_intern.h
     intern/GHOST_Xr_openxr_includes.h
     intern/GHOST_XrContext.h
diff --git a/intern/ghost/intern/GHOST_XrContext.cpp b/intern/ghost/intern/GHOST_XrContext.cpp
index a1aa3d0bd6d..e081560f64a 100644
--- a/intern/ghost/intern/GHOST_XrContext.cpp
+++ b/intern/ghost/intern/GHOST_XrContext.cpp
@@ -21,6 +21,7 @@
  */
 
 #include <cassert>
+#include <string>
 
 #include "GHOST_Types.h"
 #include "GHOST_Xr_intern.h"