From 89ad7d6b22e71ed058c2386c147154603da4bee9 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Mon, 24 Apr 2017 23:25:12 -0700 Subject: [PATCH] [vcpkg-toolchain] Add more CMAKE_SYSTEM_IGNORE_PATHs to suppress usage of system-wide openssl --- scripts/buildsystems/vcpkg.cmake | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 857e643b34..5f4340a206 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)