diff options
| author | Billy O'Neal <bion@microsoft.com> | 2020-07-06 12:42:35 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-06 12:42:35 -0700 |
| commit | 8eda81cc4dfbf9700cd36e280b6ad74d467ed9a3 (patch) | |
| tree | d13210931c83678f59a22c6f2614acdf6d36895c /scripts | |
| parent | 58ff68ae41093573f56fae580a7ef6b339abe14e (diff) | |
| download | vcpkg-8eda81cc4dfbf9700cd36e280b6ad74d467ed9a3.tar.gz vcpkg-8eda81cc4dfbf9700cd36e280b6ad74d467ed9a3.zip | |
[opengl wincrypt winsock2] Use $ENV{WindowsSdkDir} instead of hard coding Windows SDK paths. (#12232)
Also delete vcpkg_get_program_files_32_bit because it was used in only one place.
Resolves #8288
Obsoletes #11421, #11261, #8329
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cmake/vcpkg_common_functions.cmake | 1 | ||||
| -rw-r--r-- | scripts/cmake/vcpkg_find_acquire_program.cmake | 5 | ||||
| -rw-r--r-- | scripts/cmake/vcpkg_get_program_files_32_bit.cmake | 10 |
3 files changed, 4 insertions, 12 deletions
diff --git a/scripts/cmake/vcpkg_common_functions.cmake b/scripts/cmake/vcpkg_common_functions.cmake index f61e795d9..2fad7f0ed 100644 --- a/scripts/cmake/vcpkg_common_functions.cmake +++ b/scripts/cmake/vcpkg_common_functions.cmake @@ -42,7 +42,6 @@ include(vcpkg_apply_patches) include(vcpkg_copy_pdbs) include(vcpkg_copy_tool_dependencies) include(vcpkg_copy_tools) -include(vcpkg_get_program_files_32_bit) include(vcpkg_get_program_files_platform_bitness) include(vcpkg_get_windows_sdk) include(vcpkg_replace_string) diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake index 8ec9f4c9b..58a5380c2 100644 --- a/scripts/cmake/vcpkg_find_acquire_program.cmake +++ b/scripts/cmake/vcpkg_find_acquire_program.cmake @@ -56,7 +56,10 @@ function(vcpkg_find_acquire_program VAR) unset(POST_INSTALL_COMMAND) vcpkg_get_program_files_platform_bitness(PROGRAM_FILES_PLATFORM_BITNESS) - vcpkg_get_program_files_32_bit(PROGRAM_FILES_32_BIT) + set(PROGRAM_FILES_32_BIT $ENV{ProgramFiles\(X86\)}) + if (NOT DEFINED PROGRAM_FILES_32_BIT) + set(PROGRAM_FILES_32_BIT $ENV{PROGRAMFILES}) + endif() if(VAR MATCHES "PERL") set(PROGNAME perl) diff --git a/scripts/cmake/vcpkg_get_program_files_32_bit.cmake b/scripts/cmake/vcpkg_get_program_files_32_bit.cmake deleted file mode 100644 index 6f4345473..000000000 --- a/scripts/cmake/vcpkg_get_program_files_32_bit.cmake +++ /dev/null @@ -1,10 +0,0 @@ -function(vcpkg_get_program_files_32_bit ret) - - set(ret_temp $ENV{ProgramFiles\(X86\)}) - if (NOT DEFINED ret_temp) - set(ret_temp $ENV{PROGRAMFILES}) - endif() - - set(${ret} ${ret_temp} PARENT_SCOPE) - -endfunction()
\ No newline at end of file |