diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-02-24 15:02:10 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-02-24 15:02:10 -0800 |
| commit | beb1250fe486cfdd11ee003cb9a2d7faeb4bf9da (patch) | |
| tree | 4e8c5756c6c67d205547216d6aa2702c55b11b05 | |
| parent | 95a9a98edefe91fbcfffd53bfc4501955553de33 (diff) | |
| download | vcpkg-beb1250fe486cfdd11ee003cb9a2d7faeb4bf9da.tar.gz vcpkg-beb1250fe486cfdd11ee003cb9a2d7faeb4bf9da.zip | |
Improve functions that detect ProgramFiles in CMake
| -rw-r--r-- | scripts/cmake/vcpkg_get_program_files_32_bit.cmake | 11 | ||||
| -rw-r--r-- | scripts/cmake/vcpkg_get_program_files_platform_bitness.cmake | 11 |
2 files changed, 14 insertions, 8 deletions
diff --git a/scripts/cmake/vcpkg_get_program_files_32_bit.cmake b/scripts/cmake/vcpkg_get_program_files_32_bit.cmake index 386e59c75..6f4345473 100644 --- a/scripts/cmake/vcpkg_get_program_files_32_bit.cmake +++ b/scripts/cmake/vcpkg_get_program_files_32_bit.cmake @@ -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()
\ No newline at end of file diff --git a/scripts/cmake/vcpkg_get_program_files_platform_bitness.cmake b/scripts/cmake/vcpkg_get_program_files_platform_bitness.cmake index 44fba4d62..ed51b7401 100644 --- a/scripts/cmake/vcpkg_get_program_files_platform_bitness.cmake +++ b/scripts/cmake/vcpkg_get_program_files_platform_bitness.cmake @@ -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()
\ No newline at end of file |