From 351afdec8c64ea0b2f9b8d845aba0193a27670a6 Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Fri, 6 May 2022 14:26:14 -0500 Subject: [PATCH] cmake: Fix manifest generation for multi-config generators --- cmake/GenerateOpenXRRuntimeManifest.cmake | 1 + cmake/GenerateOpenXRRuntimeManifestInstall.cmake.in | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/GenerateOpenXRRuntimeManifest.cmake b/cmake/GenerateOpenXRRuntimeManifest.cmake index e2b2d21e2..80dacf0a1 100644 --- a/cmake/GenerateOpenXRRuntimeManifest.cmake +++ b/cmake/GenerateOpenXRRuntimeManifest.cmake @@ -81,6 +81,7 @@ function(generate_openxr_runtime_manifest_buildtree) # "${_genmanifest_INTERMEDIATE_MANIFEST}" COMMAND "${CMAKE_COMMAND}" + "-DOUT_FILE=${_genmanifest_OUT_FILE}" "-DRUNTIME_PATH=$" -P "${_script}" DEPENDS "${_script}") endfunction() diff --git a/cmake/GenerateOpenXRRuntimeManifestInstall.cmake.in b/cmake/GenerateOpenXRRuntimeManifestInstall.cmake.in index f1c89c866..bf7276416 100644 --- a/cmake/GenerateOpenXRRuntimeManifestInstall.cmake.in +++ b/cmake/GenerateOpenXRRuntimeManifestInstall.cmake.in @@ -9,7 +9,6 @@ set(OUT_FILENAME @_genmanifest_OUT_FILENAME@) set(CONFIGURE_OUTPUT_FILE @_genmanifest_INTERMEDIATE_MANIFEST@) set(IS_INSTALL @_genmanifest_IS_INSTALL@) set(RUNTIME_TARGET @_genmanifest_RUNTIME_TARGET@) -set(OUT_FILE @_genmanifest_OUT_FILE@) # Runtime install dir relative to install prefix set(RELATIVE_RUNTIME_DIR @_genmanifest_RELATIVE_RUNTIME_DIR@) # Runtime so/dll filename