Resolve Windows 10 Kits dir via the environment variable. (dotnet/coreclr#24960)

* Resolve Windows 10 Kits dir via environment variable. Commit migrated from https://github.com/dotnet/coreclr/commit/19d9503af320d24a44f125e7c6d5fda08f4a5e6e

Resolve Windows 10 Kits dir via the environment variable. (dotnet/coreclr#24960)
* Resolve Windows 10 Kits dir via environment variable. Commit migrated from https://github.com/dotnet/coreclr/commit/19d9503af320d24a44f125e7c6d5fda08f4a5e6e
2a764ac4 · Jeremy Koritzinsky · GitHub · 8d165145 · 2a764ac4
隐藏空白更改
内联并排

Showing with 2 addition and 5 deletion

src/coreclr/tests/src/Interop/WinRT/NativeComponent/CMakeLists.txt ...lr/tests/src/Interop/WinRT/NativeComponent/CMakeLists.txt +2 -5

未找到文件。
--- a/src/coreclr/tests/src/Interop/WinRT/NativeComponent/CMakeLists.txt
+++ b/src/coreclr/tests/src/Interop/WinRT/NativeComponent/CMakeLists.txt
@@ -28,11 +28,8 @@ else()
  message("Using Windows SDK version ${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION} for WinRT interop tests.")
 endif()

-set (PROGRAM_FILES_X86 "ProgramFiles(x86)")
-set (WINDOWS_KITS_DIR "$ENV{${PROGRAM_FILES_X86}}/Windows Kits/10")
-if (NOT EXISTS ${WINDOWS_KITS_DIR})
-  set (WINDOWS_KITS_DIR "$ENV{ProgramFiles}/Windows Kits/10")
-endif()
+file(TO_CMAKE_PATH "$ENV{WindowsSdkDir}" WINDOWS_KITS_DIR)
+
 set (METADATA_DIR "${WINDOWS_KITS_DIR}/References/${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}/windows.foundation.foundationcontract/*" )
 set (REFERENCE_WINMDS
  "${WINDOWS_KITS_DIR}/References/${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}/Windows.Foundation.FoundationContract/*/Windows.Foundation.FoundationContract.winmd"