Skip to content

Commit

Permalink
Use program files x86 environment variable when looking for vs15 inst…
Browse files Browse the repository at this point in the history
…all (microsoft#1785)

Use program files x86 environment variable when looking for vs15 install
  • Loading branch information
bhouse-microsoft authored and hekota committed Dec 21, 2018
1 parent fccaca5 commit dc4ba7e
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions cmake/modules/FindDiaSDK.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,10 @@ get_filename_component(VS_PATH64 "[HKEY_LOCAL_MACHINE\\SOFTWARE\\WOW6432Node\\Mi
# VS_PATH32 will be something like C:/Program Files (x86)/Microsoft Visual Studio 14.0/Common7/IDE

# Also look for in vs15 install.
# TODO: update this to be a non-hardcoded path. Registry keys were removed
# in vs15 in favor of COM server dlls.
# https://blogs.msdn.microsoft.com/heaths/2016/09/15/changes-to-visual-studio-15-setup/
get_filename_component(VS15_C_PATH32 "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/Common7/IDE" ABSOLUTE CACHE)
get_filename_component(VS15_P_PATH32 "C:/Program Files (x86)/Microsoft Visual Studio/2017/Professional/Common7/IDE" ABSOLUTE CACHE)
get_filename_component(VS15_E_PATH32 "C:/Program Files (x86)/Microsoft Visual Studio/2017/Enterprise/Common7/IDE" ABSOLUTE CACHE)
set(PROGRAMFILES_X86 "ProgramFiles(x86)")
get_filename_component(VS15_C_PATH32 "$ENV{${PROGRAMFILES_X86}}/Microsoft Visual Studio/2017/Community/Common7/IDE" ABSOLUTE CACHE)
get_filename_component(VS15_P_PATH32 "$ENV{${PROGRAMFILES_X86}}/Microsoft Visual Studio/2017/Professional/Common7/IDE" ABSOLUTE CACHE)
get_filename_component(VS15_E_PATH32 "$ENV{${PROGRAMFILES_X86}}/Microsoft Visual Studio/2017/Enterprise/Common7/IDE" ABSOLUTE CACHE)

# Find the TAEF path, it will typically look something like this.
# C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\DIA SDK\include
Expand Down

0 comments on commit dc4ba7e

Please sign in to comment.