From facd998c44581cf72f63e121f43118888a3aa0f9 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Thu, 25 Jul 2019 01:33:01 +0800 Subject: [Openxr-loader] Fix fatal error C1189 (#7376) --- ports/openxr-loader/0004-fix-fatal-errorC1189.patch | 13 +++++++++++++ ports/openxr-loader/CONTROL | 2 +- ports/openxr-loader/portfile.cmake | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 ports/openxr-loader/0004-fix-fatal-errorC1189.patch diff --git a/ports/openxr-loader/0004-fix-fatal-errorC1189.patch b/ports/openxr-loader/0004-fix-fatal-errorC1189.patch new file mode 100644 index 000000000..f71a99c62 --- /dev/null +++ b/ports/openxr-loader/0004-fix-fatal-errorC1189.patch @@ -0,0 +1,13 @@ +diff --git a/src/loader/CMakeLists.txt b/src/loader/CMakeLists.txt +index 92985a5..b265091 100644 +--- a/src/loader/CMakeLists.txt ++++ b/src/loader/CMakeLists.txt +@@ -134,7 +134,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows") + endforeach() + + target_link_libraries(${LOADER_NAME} shlwapi) +- target_compile_options(${LOADER_NAME} PRIVATE) ++ target_compile_options(${LOADER_NAME} PRIVATE /std:c++17) + generate_export_header(${LOADER_NAME}) + # set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS false) + diff --git a/ports/openxr-loader/CONTROL b/ports/openxr-loader/CONTROL index 3c9379e9b..7fd84105b 100644 --- a/ports/openxr-loader/CONTROL +++ b/ports/openxr-loader/CONTROL @@ -1,5 +1,5 @@ Source: openxr-loader -Version: 0.90.1 +Version: 0.90.1-1 Description: Khronos API for abstracting VR/MR/AR hardware Feature: vulkan diff --git a/ports/openxr-loader/portfile.cmake b/ports/openxr-loader/portfile.cmake index 8b2fb4671..c1de0d142 100644 --- a/ports/openxr-loader/portfile.cmake +++ b/ports/openxr-loader/portfile.cmake @@ -22,6 +22,7 @@ vcpkg_from_github( 0002-fix-linux-pkgconfig-dependency.patch # Python < 3.6 doesn't allow a WindowsPath object to act as a pathlike in os.path functions 0003-windows-path-python-fix.patch + 0004-fix-fatal-errorC1189.patch ) # Weird behavior inside the OpenXR loader. On Windows they force shared libraries to use static crt, and -- cgit v1.2.3