From 884bf46bf40980708e62d392ded79e384374b23e Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 13 May 2019 03:37:02 +0200 Subject: [PATCH] also ignore x86 openssl paths (#6416) --- scripts/buildsystems/vcpkg.cmake | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 10e8bd75e4..fd16b5f314 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/"