From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Wed, 5 Jun 2019 16:58:04 +0000 (-0700)
Subject: Resolve Windows 10 Kits dir via the environment variable. (#24960)
X-Git-Tag: accepted/tizen/unified/20190813.215958~40^2~272
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=19d9503af320d24a44f125e7c6d5fda08f4a5e6e;p=platform%2Fupstream%2Fcoreclr.git

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

* Resolve Windows 10 Kits dir via environment variable.
---

diff --git a/tests/src/Interop/WinRT/NativeComponent/CMakeLists.txt b/tests/src/Interop/WinRT/NativeComponent/CMakeLists.txt
index 00cef94..536e4c4 100644
--- a/tests/src/Interop/WinRT/NativeComponent/CMakeLists.txt
+++ b/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"