From 02fa0eb4c606ceb38682de1bd168074041ff08ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?=
 <47264268+JackBoosY@users.noreply.github.com>
Date: Fri, 11 Jun 2021 23:45:08 +0800
Subject: [openssl] Add cmake wrapper to handle OPENSSL_ROOT_DIR (#18042)

* [openssl] Add cmake wrapper to handle OPENSSL_ROOT_DIR

* Get the abs path

* update version record

* apply suggestion.

* Clean up openssl related code, move to openssl wrapper.

* update version record

* [kf5holidays] Disable parallel configure

* update version record

* update version record

* bump version

* Update versions/o-/openssl.json

* update baseline

* Update ports/openssl/vcpkg-cmake-wrapper.cmake

* Update ports/openssl/vcpkg-cmake-wrapper.cmake

* Update versions/o-/openssl.json

* Update ports/openssl/vcpkg.json

* Update versions/o-/openssl.json

* Update ports/openssl/vcpkg.json

* Update versions/o-/openssl.json

* update version record
---
 scripts/buildsystems/vcpkg.cmake | 27 ---------------------------
 1 file changed, 27 deletions(-)

(limited to 'scripts')

diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake
index d34580ec0..446e64f23 100644
--- a/scripts/buildsystems/vcpkg.cmake
+++ b/scripts/buildsystems/vcpkg.cmake
@@ -419,33 +419,6 @@ endif()
 
 set(VCPKG_CMAKE_FIND_ROOT_PATH "${CMAKE_FIND_ROOT_PATH}")
 
-file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" Z_VCPKG_PROGRAMFILES)
-set(Z_VCPKG_PROGRAMFILESX86_NAME "PROGRAMFILES(x86)")
-file(TO_CMAKE_PATH "$ENV{${Z_VCPKG_PROGRAMFILESX86_NAME}}" Z_VCPKG_PROGRAMFILESX86)
-set(CMAKE_SYSTEM_IGNORE_PATH
-    "${Z_VCPKG_PROGRAMFILES}/OpenSSL"
-    "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win32"
-    "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win64"
-    "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win32/lib/VC"
-    "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win64/lib/VC"
-    "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win32/lib/VC/static"
-    "${Z_VCPKG_PROGRAMFILES}/OpenSSL-Win64/lib/VC/static"
-    "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL"
-    "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win32"
-    "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win64"
-    "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win32/lib/VC"
-    "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win64/lib/VC"
-    "${Z_VCPKG_PROGRAMFILESX86}/OpenSSL-Win32/lib/VC/static"
-    "${Z_VCPKG_PROGRAMFILESX86}/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"
-)
-
 # CMAKE_EXECUTABLE_SUFFIX is not yet defined
 if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
     set(Z_VCPKG_EXECUTABLE "${Z_VCPKG_ROOT_DIR}/vcpkg.exe")
-- 
cgit v1.2.3