[Bf-blender-cvs] [b1b0e05c540] soc-2019-openxr: Fix CMake errors after merge (?)

[Julian Eisel]

Commit: b1b0e05c540b54b1e2d935de8e21680680647190
Author: Julian Eisel
Date:   Thu Jun 6 11:25:53 2019 +0200
Branches: soc-2019-openxr
https://developer.blender.org/rBb1b0e05c540b54b1e2d935de8e21680680647190

Fix CMake errors after merge (?)

Not sure if this is caused by changes just merged in, or by a system
upgrade I just did. Either way, fixed it now.

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

M	extern/openxr/loader/CMakeLists.txt
M	release/scripts/addons
M	release/scripts/addons_contrib
M	source/blender/windowmanager/CMakeLists.txt

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

diff --git a/extern/openxr/loader/CMakeLists.txt b/extern/openxr/loader/CMakeLists.txt
index 8bd1fb8e980..2497ffd88df 100644
--- a/extern/openxr/loader/CMakeLists.txt
+++ b/extern/openxr/loader/CMakeLists.txt
@@ -68,8 +68,24 @@ set(LIB
   jsoncpp_lib
 )
 
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+  list(APPEND LIB
+    -lstdc++fs -ldl -lpthread -lm
+  )
+endif()
+
 blender_add_lib(${LOADER_NAME} "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+  target_compile_definitions(
+    ${LOADER_NAME}
+      PRIVATE FALLBACK_CONFIG_DIRS="${FALLBACK_CONFIG_DIRS}"
+      PRIVATE FALLBACK_DATA_DIRS="${FALLBACK_DATA_DIRS}"
+      PRIVATE SYSCONFDIR="${CMAKE_INSTALL_FULL_SYSCONFDIR}"
+  )
+endif()
+
+
 add_custom_target(
   loader_gen_files
   DEPENDS
@@ -84,14 +100,3 @@ add_dependencies(
     loader_gen_files
 #   jsoncppAmalgamatedFiles
 )
-
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-  target_compile_definitions(
-    ${LOADER_NAME}
-      PRIVATE FALLBACK_CONFIG_DIRS="${FALLBACK_CONFIG_DIRS}"
-      PRIVATE FALLBACK_DATA_DIRS="${FALLBACK_DATA_DIRS}"
-      PRIVATE SYSCONFDIR="${CMAKE_INSTALL_FULL_SYSCONFDIR}"
-  )
-
-  target_link_libraries(${LOADER_NAME} -lstdc++fs -ldl -lpthread -lm)
-endif()
diff --git a/release/scripts/addons b/release/scripts/addons
index ed3545322bb..c5452a62178 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit ed3545322bb94004cca9f56b8f8a6e1ab8ce54d6
+Subproject commit c5452a62178454d7e804ce711674dd0a400c2140
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 0409b81f454..4af87c687bc 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 0409b81f45445c2934ad223e430ca7d8970ae5f0
+Subproject commit 4af87c687bc1afa2968f13602897782d5c5d622a
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt
index b8a6ce98759..b7bea4adb79 100644
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@ -181,18 +181,18 @@ if(WITH_OPENXR)
   list(APPEND INC_SYS
     ${OPENXR_SDK_INCLUDES}
   )
-  add_definitions(-DWITH_OPENXR)
-endif()
 
-blender_add_lib_nolist(bf_windowmanager "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
+  if(OPENXR_USE_BUNDLED_SRC)
+    if(WIN32)
+      set(OPENXR_LOADER_NAME openxr_loader-0_90)
+    else()
+      set(OPENXR_LOADER_NAME openxr_loader)
+    endif()
 
-if(WITH_OPENXR AND OPENXR_USE_BUNDLED_SRC)
-  if(WIN32)
-    set(OPENXR_LOADER_NAME openxr_loader-0_90)
-  else()
-    set(OPENXR_LOADER_NAME openxr_loader)
+    list(APPEND LIB ${OPENXR_LOADER_NAME})
   endif()
 
-  add_dependencies(bf_windowmanager generate_openxr_header)
-  target_link_libraries(bf_windowmanager ${OPENXR_LOADER_NAME})
+  add_definitions(-DWITH_OPENXR)
 endif()
+
+blender_add_lib_nolist(bf_windowmanager "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")