diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2019-05-13 03:37:02 +0200 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2019-05-12 18:37:02 -0700 |
| commit | 884bf46bf40980708e62d392ded79e384374b23e (patch) | |
| tree | 4b243ca466d4c39ee78d0ded55565f5525bd686b | |
| parent | 14bfca23c51ca7bdeea44681677a93be1fbeb5fb (diff) | |
| download | vcpkg-884bf46bf40980708e62d392ded79e384374b23e.tar.gz vcpkg-884bf46bf40980708e62d392ded79e384374b23e.zip | |
also ignore x86 openssl paths (#6416)
| -rw-r--r-- | scripts/buildsystems/vcpkg.cmake | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 10e8bd75e..fd16b5f31 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -130,6 +130,7 @@ else() #Release build: Put Release paths before Debug paths. Debug Paths are req endif() file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _programfiles) +file(TO_CMAKE_PATH "$ENV{PROGRAMFILES(x86)}" _programfiles_x86) set(CMAKE_SYSTEM_IGNORE_PATH "${_programfiles}/OpenSSL" "${_programfiles}/OpenSSL-Win32" @@ -138,6 +139,13 @@ set(CMAKE_SYSTEM_IGNORE_PATH "${_programfiles}/OpenSSL-Win64/lib/VC" "${_programfiles}/OpenSSL-Win32/lib/VC/static" "${_programfiles}/OpenSSL-Win64/lib/VC/static" + "${_programfiles_x86}/OpenSSL" + "${_programfiles_x86}/OpenSSL-Win32" + "${_programfiles_x86}/OpenSSL-Win64" + "${_programfiles_x86}/OpenSSL-Win32/lib/VC" + "${_programfiles_x86}/OpenSSL-Win64/lib/VC" + "${_programfiles_x86}/OpenSSL-Win32/lib/VC/static" + "${_programfiles_x86}/OpenSSL-Win64/lib/VC/static" "C:/OpenSSL/" "C:/OpenSSL-Win32/" "C:/OpenSSL-Win64/" |