3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-14 12:21:51 +08:00
Code Issues Projects Releases Wiki Activity

Improve functions that detect ProgramFiles in CMake

Browse Source
This commit is contained in:
Alexander Karatarakis 2017-02-24 15:02:10 -08:00
parent 95a9a98ede
commit beb1250fe4
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/cmake/vcpkg_get_program_files_32_bit.cmake
View File

@ -1,7 +1,10 @@
function(vcpkg_get_program_files_32_bit ret)
if(DEFINED ENV{ProgramFiles\(X86\)})
set(${ret} $ENV{ProgramFiles\(X86\)} PARENT_SCOPE)
else()
set(${ret} $ENV{PROGRAMFILES} PARENT_SCOPE)
set(ret_temp $ENV{ProgramFiles\(X86\)})
if (NOT DEFINED ret_temp)
set(ret_temp $ENV{PROGRAMFILES})
endif()
set(${ret} ${ret_temp} PARENT_SCOPE)
endfunction()

11
scripts/cmake/vcpkg_get_program_files_platform_bitness.cmake
View File

@ -1,7 +1,10 @@
function(vcpkg_get_program_files_platform_bitness ret)
if(DEFINED ENV{ProgramW6432})
set(${ret} $ENV{ProgramW6432} PARENT_SCOPE)
else()
set(${ret} $ENV{PROGRAMFILES} PARENT_SCOPE)
set(ret_temp $ENV{ProgramW6432})
if (NOT DEFINED ret_temp)
set(ret_temp $ENV{PROGRAMFILES})
endif()
set(${ret} ${ret_temp} PARENT_SCOPE)
endfunction()