diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-04-24 23:25:12 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-04-24 23:25:12 -0700 |
| commit | 89ad7d6b22e71ed058c2386c147154603da4bee9 (patch) | |
| tree | a417f73323c5eb5c5169be070611da6fb37c974c /scripts | |
| parent | c07e3b26f285e6dc9ed2ab522c300d725da95be4 (diff) | |
| download | vcpkg-89ad7d6b22e71ed058c2386c147154603da4bee9.tar.gz vcpkg-89ad7d6b22e71ed058c2386c147154603da4bee9.zip | |
[vcpkg-toolchain] Add more CMAKE_SYSTEM_IGNORE_PATHs to suppress usage of system-wide openssl
Diffstat (limited to 'scripts')
| -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 857e643b3..5f4340a20 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -86,9 +86,17 @@ if(NOT VCPKG_TOOLCHAIN) "${_programfiles}/OpenSSL" "${_programfiles}/OpenSSL-Win32" "${_programfiles}/OpenSSL-Win64" + "${_programfiles}/OpenSSL-Win32/lib/VC" + "${_programfiles}/OpenSSL-Win64/lib/VC" + "${_programfiles}/OpenSSL-Win32/lib/VC/static" + "${_programfiles}/OpenSSL-Win64/lib/VC/static" "C:/OpenSSL/" "C:/OpenSSL-Win32/" "C:/OpenSSL-Win64/" + "C:/OpenSSL-Win32/lib/VC" + "C:/OpenSSL-Win64/lib/VC" + "C:/OpenSSL-Win32/lib/VC/static" + "C:/OpenSSL-Win64/lib/VC/static" ) set(CMAKE_PROGRAM_PATH ${CMAKE_PROGRAM_PATH} ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools) |