[Bf-blender-cvs] [80c6f6eb4e8] soc-2019-openxr: Merge branch 'master' into temp-openxr-buildstuff

[Julian Eisel]

Commit: 80c6f6eb4e85e61e23e2e8c393eeea4885d16396
Author: Julian Eisel
Date:   Wed Feb 26 21:17:04 2020 +0100
Branches: soc-2019-openxr
https://developer.blender.org/rB80c6f6eb4e85e61e23e2e8c393eeea4885d16396

Merge branch 'master' into temp-openxr-buildstuff

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



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

diff --cc build_files/cmake/platform/platform_unix.cmake
index 2d0ec95bcd8,3b40f7c329b..50919b3ac6a
--- a/build_files/cmake/platform/platform_unix.cmake
+++ b/build_files/cmake/platform/platform_unix.cmake
@@@ -448,14 -428,13 +428,21 @@@ if(WITH_TBB
    find_package_wrapper(TBB)
  endif()
  
 +if(WITH_OPENXR)
 +  find_package(OpenXR-SDK)
 +  if(NOT OPENXR_SDK_FOUND)
 +    message(WARNING "OpenXR-SDK not found, disabling WITH_OPENXR")
 +    set(WITH_OPENXR OFF)
 +  endif()
 +endif()
 +
+ if(EXISTS ${LIBDIR})
+   without_system_libs_end()
+ endif()
+ 
+ # ----------------------------------------------------------------------------
+ # Build and Link Flags
+ 
  # OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed
  if(HAIKU)
    list(APPEND PLATFORM_LINKLIBS -lnetwork)