[Bf-blender-cvs] [4456dbcdedc] soc-2019-openxr: Remove now unnecessary OpenXR SDK patch for Win CRT linkage

Julian Eisel noreply at git.blender.org
Fri Nov 15 11:30:08 CET 2019


Commit: 4456dbcdedcd37a858ab076635cbc7b3f4f25d31
Author: Julian Eisel
Date:   Thu Nov 14 11:51:39 2019 +0100
Branches: soc-2019-openxr
https://developer.blender.org/rB4456dbcdedcd37a858ab076635cbc7b3f4f25d31

Remove now unnecessary OpenXR SDK patch for Win CRT linkage

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

M	build_files/build_environment/cmake/openxr.cmake
D	build_files/build_environment/patches/openxr_sdk.diff

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

diff --git a/build_files/build_environment/cmake/openxr.cmake b/build_files/build_environment/cmake/openxr.cmake
index e4599e04161..3b827683a14 100644
--- a/build_files/build_environment/cmake/openxr.cmake
+++ b/build_files/build_environment/cmake/openxr.cmake
@@ -29,7 +29,6 @@ ExternalProject_Add(external_openxr_sdk
   URL_HASH MD5=${OPENXR_SDK_HASH}
   PREFIX ${BUILD_DIR}/openxr_sdk
   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openxr_sdk ${DEFAULT_CMAKE_FLAGS} ${OPENXR_SDK_EXTRA_ARGS}
-  PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/openxr_sdk/src/external_openxr_sdk < ${PATCH_DIR}/openxr_sdk.diff
   INSTALL_DIR ${LIBDIR}/openxr_sdk
 )
 
diff --git a/build_files/build_environment/patches/openxr_sdk.diff b/build_files/build_environment/patches/openxr_sdk.diff
deleted file mode 100644
index 4239fba4f16..00000000000
--- a/build_files/build_environment/patches/openxr_sdk.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naur orig/src/loader/CMakeLists.txt external_openxr_sdk/src/loader/CMakeLists.txt
---- orig/src/loader/CMakeLists.txt	2019-07-29 07:06:59 -0600
-+++ external_openxr_sdk/src/loader/CMakeLists.txt	2019-08-20 07:56:51 -0600
-@@ -128,24 +128,6 @@
-     configure_file("openxr.pc.in" "openxr.pc" @ONLY)
-     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/openxr.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
- elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
--    foreach(configuration in CMAKE_C_FLAGS_DEBUG
--                             CMAKE_C_FLAGS_RELEASE
--                             CMAKE_C_FLAGS_RELWITHDEBINFO
--                             CMAKE_CXX_FLAGS_DEBUG
--                             CMAKE_CXX_FLAGS_RELEASE
--                             CMAKE_CXX_FLAGS_RELWITHDEBINFO)
--        # If building DLLs, force static CRT linkage
--        if(DYNAMIC_LOADER)
--            if (${configuration} MATCHES "/MD")
--                string(REGEX REPLACE "/MD" "/MT" ${configuration} "${${configuration}}")
--            endif()
--        else()  # Otherwise for static libs, link the CRT dynamically
--            if (${configuration} MATCHES "/MT")
--                string(REGEX REPLACE "/MT" "/MD" ${configuration} "${${configuration}}")
--            endif()
--        endif()
--    endforeach()
--
-     target_link_libraries(${LOADER_NAME} shlwapi)
-     target_compile_options(${LOADER_NAME} PRIVATE)
-     generate_export_header(${LOADER_NAME})



More information about the Bf-blender-cvs mailing list