[Bf-blender-cvs] [517a3cdad14] xr-controller-support: Adjust CMakeLists, fix typo

[Peter Kim]

Commit: 517a3cdad146074cca652d63f371dd9eaae8b83c
Author: Peter Kim
Date:   Thu Apr 29 15:32:27 2021 +0900
Branches: xr-controller-support
https://developer.blender.org/rB517a3cdad146074cca652d63f371dd9eaae8b83c

Adjust CMakeLists, fix typo

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

M	intern/ghost/intern/GHOST_XrSession.cpp
M	source/blender/makesrna/intern/CMakeLists.txt
M	source/blender/windowmanager/CMakeLists.txt

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

diff --git a/intern/ghost/intern/GHOST_XrSession.cpp b/intern/ghost/intern/GHOST_XrSession.cpp
index 395d0148767..7f7497a7525 100644
--- a/intern/ghost/intern/GHOST_XrSession.cpp
+++ b/intern/ghost/intern/GHOST_XrSession.cpp
@@ -828,7 +828,7 @@ bool GHOST_XrSession::createActionSpaces(const char *action_set_name,
                    .c_str());
 
       std::map<std::string, XrSpace> &spaces = action->spaces;
-      if (spaces.find(info.action_name) == spaces.end()) {
+      if (spaces.find(subaction_path) == spaces.end()) {
         spaces.insert({subaction_path, std::move(space)});
       }
       else {
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
index bf55ef0c040..4fafa356879 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -363,9 +363,6 @@ if(WITH_INPUT_NDOF)
 endif()
 
 if(WITH_XR_OPENXR)
-  list(APPEND INC
-    ../../windowmanager/xr
-  )
   add_definitions(-DWITH_XR_OPENXR)
 endif()
 
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt
index fe8cf032b30..2194e8a7a31 100644
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@ -27,7 +27,6 @@ set(INC
   ../blenlib
   ../blenloader
   ../blentranslation
-  ../bmesh
   ../compositor
   ../depsgraph
   ../editors/include
@@ -200,15 +199,17 @@ if(WITH_XR_OPENXR)
 
   list(APPEND INC
     xr
+    # for wm_xr_operators.c: BKE_editmesh.h
+    ../bmesh
   )
 
   list(APPEND SRC
     xr/intern/wm_xr.c
-    xr/intern/wm_xr_draw.c
-    xr/intern/wm_xr_session.c
-    xr/intern/wm_xr_actions.c
     xr/intern/wm_xr_actionmap.c
+    xr/intern/wm_xr_actions.c
+    xr/intern/wm_xr_draw.c
     xr/intern/wm_xr_operators.c
+    xr/intern/wm_xr_session.c
 
     xr/wm_xr.h
     xr/intern/wm_xr_intern.h