3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-29 03:34:26 +08:00
Code Issues Projects Releases Wiki Activity

also ignore x86 openssl paths (#6416)

Browse Source
This commit is contained in:
Alexander Neumann 2019-05-13 03:37:02 +02:00 committed by Robert Schumacher
parent 14bfca23c5
commit 884bf46bf4
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/buildsystems/vcpkg.cmake
View File

@ -130,6 +130,7 @@ else() #Release build: Put Release paths before Debug paths. Debug Paths are req
endif() endif()
file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _programfiles) file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _programfiles)
file(TO_CMAKE_PATH "$ENV{PROGRAMFILES(x86)}" _programfiles_x86)
set(CMAKE_SYSTEM_IGNORE_PATH set(CMAKE_SYSTEM_IGNORE_PATH
"${_programfiles}/OpenSSL" "${_programfiles}/OpenSSL"
"${_programfiles}/OpenSSL-Win32" "${_programfiles}/OpenSSL-Win32"
@ -138,6 +139,13 @@ set(CMAKE_SYSTEM_IGNORE_PATH
"${_programfiles}/OpenSSL-Win64/lib/VC" "${_programfiles}/OpenSSL-Win64/lib/VC"
"${_programfiles}/OpenSSL-Win32/lib/VC/static" "${_programfiles}/OpenSSL-Win32/lib/VC/static"
"${_programfiles}/OpenSSL-Win64/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/"
"C:/OpenSSL-Win32/" "C:/OpenSSL-Win32/"
"C:/OpenSSL-Win64/" "C:/OpenSSL-Win64/"