[openssl] Revise vcpkg cmake wrapper (#22701)

* Revise OpenSSL wrapper * Update versions * Bump port-version * Shorten OPENSSL_ROOT_DIR setup * Update versions * CR comments * Update versions Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
microsoft · Feb 8, 2022 · afb2279 · afb2279
1 parent a709191
commit afb2279
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 37 deletions.
diff --git a/ports/openssl/vcpkg-cmake-wrapper.cmake.in b/ports/openssl/vcpkg-cmake-wrapper.cmake.in
@@ -1,40 +1,47 @@
-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)
+cmake_policy(PUSH)
+cmake_policy(SET CMP0012 NEW)
+cmake_policy(SET CMP0054 NEW)
+cmake_policy(SET CMP0057 NEW)
 
-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"
-    )
+if(OPENSSL_USE_STATIC_LIBS)
+    if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "dynamic")
+        message(WARNING "OPENSSL_USE_STATIC_LIBS is set, but vcpkg port openssl was built with dynamic linkage")
+    endif()
+    set(OPENSSL_USE_STATIC_LIBS_BAK "${OPENSSL_USE_STATIC_LIBS}")
+    set(OPENSSL_USE_STATIC_LIBS FALSE)
+endif()
+
+if(DEFINED OPENSSL_ROOT_DIR)
+    set(OPENSSL_ROOT_DIR_BAK "${OPENSSL_ROOT_DIR}")
+endif()
+get_filename_component(OPENSSL_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY)
+get_filename_component(OPENSSL_ROOT_DIR "${OPENSSL_ROOT_DIR}" DIRECTORY)
+find_path(OPENSSL_INCLUDE_DIR NAMES openssl/ssl.h PATH "${OPENSSL_ROOT_DIR}/include" NO_DEFAULT_PATH)
+if(MSVC)
+    find_library(LIB_EAY_DEBUG NAMES libcrypto PATHS "${OPENSSL_ROOT_DIR}/debug/lib" NO_DEFAULT_PATH)
+    find_library(LIB_EAY_RELEASE NAMES libcrypto PATHS "${OPENSSL_ROOT_DIR}/lib" NO_DEFAULT_PATH)
+    find_library(SSL_EAY_DEBUG NAMES libssl PATHS "${OPENSSL_ROOT_DIR}/debug/lib" NO_DEFAULT_PATH)
+    find_library(SSL_EAY_RELEASE NAMES libssl PATHS "${OPENSSL_ROOT_DIR}/lib" NO_DEFAULT_PATH)
+elseif(WIN32)
+    find_library(LIB_EAY NAMES libcrypto crypto NAMES_PER_DIR)
+    find_library(SSL_EAY NAMES libssl ssl NAMES_PER_DIR)
+else()
+    find_library(OPENSSL_CRYPTO_LIBRARY NAMES crypto)
+    find_library(OPENSSL_SSL_LIBRARY NAMES ssl)
 endif()
 
 _find_package(${ARGS})
 
-set(OPENSSL_ROOT_DIR ${OPENSSL_ROOT_DIR_BAK})
+unset(OPENSSL_ROOT_DIR)
+if(DEFINED OPENSSL_ROOT_DIR_BAK)
+    set(OPENSSL_ROOT_DIR "${OPENSSL_ROOT_DIR_BAK}")
+    unset(OPENSSL_ROOT_DIR_BAK)
+endif()
+
+if(DEFINED OPENSSL_USE_STATIC_LIBS_BAK)
+    set(OPENSSL_USE_STATIC_LIBS "${OPENSSL_USE_STATIC_LIBS_BAK}")
+    unset(OPENSSL_USE_STATIC_LIBS_BAK)
+endif()
 
 if(OPENSSL_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
     if(WIN32)
@@ -46,8 +53,6 @@ if(OPENSSL_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
             set_property(TARGET OpenSSL::SSL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "crypt32;ws2_32")
         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")
@@ -68,6 +73,6 @@ if(OPENSSL_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
         if(TARGET OpenSSL::SSL)
             set_property(TARGET OpenSSL::SSL APPEND PROPERTY INTERFACE_LINK_LIBRARIES "Threads::Threads")
         endif()
-        cmake_policy(POP)
     endif()
 endif()
+cmake_policy(POP)
diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "openssl",
   "version-string": "1.1.1m",
-  "port-version": 1,
+  "port-version": 2,
   "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",
+  "license": "OpenSSL",
   "dependencies": [
     {
       "name": "vcpkg-cmake",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -5070,7 +5070,7 @@
     },
     "openssl": {
       "baseline": "1.1.1m",
-      "port-version": 1
+      "port-version": 2
     },
     "openssl-unix": {
       "baseline": "1.1.1h",

diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "29c9d32a703896143a51c55f0b7ae4298684afd6",
+      "version-string": "1.1.1m",
+      "port-version": 2
+    },
     {
       "git-tree": "9b8e2ac096b1cd8782137a853c5fc76e07c2af9a",
       "version-string": "1.1.1m",