[openssl] Fix vcpkg-cmake-wrapper.cmake (#18475)

* [openssl] Fix vcpkg-cmake-wrapper.cmake

* Update baseline revision

* Update the wrapper

* Update the baseline

* Update the wrapper

* Update the baseline

* Update the wrapper

* Update the baseline

* Update the wrapper

* Update the baseline

* Update the wrapper

* Update the baseline

* Update the wrapper

* Update the baseline

* Bump port-version.

* Update the baseline version

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

10 files changed, 81 insertions, 73 deletions

diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake
index 445bce149..c507c0f7e 100644
--- a/ports/openssl/portfile.cmake
+++ b/ports/openssl/portfile.cmake
@@ -21,5 +21,5 @@ else()
     include("${CMAKE_CURRENT_LIST_DIR}/unix/portfile.cmake")
 endif()
 
-file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY)
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/ports/openssl/unix/portfile.cmake b/ports/openssl/unix/portfile.cmake
index 912234925..f051fd639 100644
--- a/ports/openssl/unix/portfile.cmake
+++ b/ports/openssl/unix/portfile.cmake
@@ -43,7 +43,3 @@ endforeach()
 
 file(INSTALL ${RESOLVED_HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include/openssl)
 file(INSTALL ${MASTER_COPY_SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/openssl)
-endif()
diff --git a/ports/openssl/unix/vcpkg-cmake-wrapper.cmake b/ports/openssl/unix/vcpkg-cmake-wrapper.cmake
deleted file mode 100644
index 43e84cb02..000000000
--- a/ports/openssl/unix/vcpkg-cmake-wrapper.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-_find_package(${ARGS})

-if(OPENSSL_FOUND)

-    find_library(OPENSSL_DL_LIBRARY NAMES dl)

-    if(OPENSSL_DL_LIBRARY)

-        list(APPEND OPENSSL_LIBRARIES "dl")

-        if(TARGET OpenSSL::Crypto)

-            set_property(TARGET OpenSSL::Crypto APPEND PROPERTY INTERFACE_LINK_LIBRARIES "dl")

-        endif()

-    endif()

-    find_package(Threads REQUIRED)

-    list(APPEND OPENSSL_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})

-    if(TARGET OpenSSL::Crypto)

-        set_property(TARGET OpenSSL::Crypto APPEND PROPERTY INTERFACE_LINK_LIBRARIES "Threads::Threads")

-    endif()

-    if(TARGET OpenSSL::SSL)

-        set_property(TARGET OpenSSL::SSL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "Threads::Threads")

-    endif()

-endif()

diff --git a/ports/openssl/vcpkg-cmake-wrapper.cmake b/ports/openssl/vcpkg-cmake-wrapper.cmake
deleted file mode 100644
index 6ef468ee6..000000000
--- a/ports/openssl/vcpkg-cmake-wrapper.cmake
+++ /dev/null
@@ -1,35 +0,0 @@
-set(OPENSSL_ROOT_DIR_BAK ${OPENSSL_ROOT_DIR})

-get_filename_component(OPENSSL_ROOT_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)

-get_filename_component(OPENSSL_ROOT_DIR "${OPENSSL_ROOT_DIR}" PATH)

-get_filename_component(OPENSSL_ROOT_DIR "${OPENSSL_ROOT_DIR}" 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"

-)

-

-_find_package(${ARGS})

-

-set(OPENSSL_ROOT_DIR ${OPENSSL_ROOT_DIR_BAK})

diff --git a/ports/openssl/vcpkg-cmake-wrapper.cmake.in b/ports/openssl/vcpkg-cmake-wrapper.cmake.in
new file mode 100644
index 000000000..f1c3176cf
--- /dev/null
+++ b/ports/openssl/vcpkg-cmake-wrapper.cmake.in
@@ -0,0 +1,73 @@
+set(OPENSSL_ROOT_DIR_BAK ${OPENSSL_ROOT_DIR})
+get_filename_component(OPENSSL_ROOT_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(OPENSSL_ROOT_DIR "${OPENSSL_ROOT_DIR}" PATH)
+get_filename_component(OPENSSL_ROOT_DIR "${OPENSSL_ROOT_DIR}" PATH)
+
+if(CMAKE_HOST_WIN32)
+    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"
+    )
+endif()
+
+_find_package(${ARGS})
+
+set(OPENSSL_ROOT_DIR ${OPENSSL_ROOT_DIR_BAK})
+
+if(OPENSSL_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
+    if(WIN32)
+        list(APPEND OPENSSL_LIBRARIES Crypt32.lib ws2_32.lib)
+        if(TARGET OpenSSL::Crypto)
+            set_property(TARGET OpenSSL::Crypto APPEND PROPERTY INTERFACE_LINK_LIBRARIES "Crypt32.lib;ws2_32.lib")
+        endif()
+        if(TARGET OpenSSL::SSL)
+            set_property(TARGET OpenSSL::SSL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "Crypt32.lib;ws2_32.lib")
+        endif()
+    else()
+        cmake_policy(PUSH)
+        cmake_policy(SET CMP0057 NEW)
+        find_library(OPENSSL_DL_LIBRARY NAMES dl)
+        if(OPENSSL_DL_LIBRARY)
+            list(APPEND OPENSSL_LIBRARIES "dl")
+            if(TARGET OpenSSL::Crypto)
+                set_property(TARGET OpenSSL::Crypto APPEND PROPERTY INTERFACE_LINK_LIBRARIES "dl")
+            endif()
+        endif()
+
+        if("REQUIRED" IN_LIST ARGS)
+           find_package(Threads REQUIRED)
+        else()
+           find_package(Threads)
+        endif()
+        list(APPEND OPENSSL_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
+        if(TARGET OpenSSL::Crypto)
+            set_property(TARGET OpenSSL::Crypto APPEND PROPERTY INTERFACE_LINK_LIBRARIES "Threads::Threads")
+        endif()
+        if(TARGET OpenSSL::SSL)
+            set_property(TARGET OpenSSL::SSL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "Threads::Threads")
+        endif()
+        cmake_policy(POP)
+    endif()
+endif()
diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json
index 6dc21f493..9c4ec7f1e 100644
--- a/ports/openssl/vcpkg.json
+++ b/ports/openssl/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "openssl",
   "version-string": "1.1.1k",
-  "port-version": 7,
+  "port-version": 8,
   "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.",
   "homepage": "https://www.openssl.org"
 }
diff --git a/ports/openssl/windows/portfile.cmake b/ports/openssl/windows/portfile.cmake
index 3065abddc..4987e8107 100644
--- a/ports/openssl/windows/portfile.cmake
+++ b/ports/openssl/windows/portfile.cmake
@@ -172,6 +172,3 @@ vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/openssl/rand.h"
 vcpkg_copy_pdbs()
 
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/openssl")
-endif()
diff --git a/ports/openssl/windows/vcpkg-cmake-wrapper.cmake b/ports/openssl/windows/vcpkg-cmake-wrapper.cmake
deleted file mode 100644
index 715448d25..000000000
--- a/ports/openssl/windows/vcpkg-cmake-wrapper.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-_find_package(${ARGS})

-if(OPENSSL_FOUND)

-    list(APPEND OPENSSL_LIBRARIES Crypt32.lib ws2_32.lib)

-    if(TARGET OpenSSL::Crypto)

-        set_property(TARGET OpenSSL::Crypto APPEND PROPERTY INTERFACE_LINK_LIBRARIES "Crypt32.lib;ws2_32.lib")

-    endif()

-    if(TARGET OpenSSL::SSL)

-        set_property(TARGET OpenSSL::SSL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "Crypt32.lib;ws2_32.lib")

-    endif()

-endif()

diff --git a/versions/baseline.json b/versions/baseline.json
index 01921d95c..3b4114f17 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4654,7 +4654,7 @@
     },
     "openssl": {
       "baseline": "1.1.1k",
-      "port-version": 7
+      "port-version": 8
     },
     "openssl-unix": {
       "baseline": "1.1.1h",
diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json
index 474c91547..d6807c929 100644
--- a/versions/o-/openssl.json
+++ b/versions/o-/openssl.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "80b86b6b857d1b7bbb2c24cfcded13c28a4c3e81",
+      "version-string": "1.1.1k",
+      "port-version": 8
+    },
+    {
       "git-tree": "affa6f8de25994a485d4310cb56ddbc0df9ac705",
       "version-string": "1.1.1k",
       "port-version": 7