Merge pull request #1185 from openziti/win32-build-split

win32 build: produce two flavors - openssl and win32crypto

Author: ekoby

.github/workflows/cmake.yml

@@ -30,6 +30,10 @@ jobs:
             name: Windows x86_64
             preset: windows-x64-mingw
 
+          - os: windows-latest
+            name: Windows x86_64(win32crypto)
+            preset: windows-x64-win32crypto
+
           - os: windows-latest
             name: Windows arm64
             preset: windows-arm64-vs2022

CMakeLists.txt

@@ -137,14 +137,19 @@ add_custom_target(bundle
 
 file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/bundle)
 
+message(NOTICE "tlsuv = ${TLSUV_TLSLIB}")
+if (TLSUV_TLSLIB AND NOT TLSUV_TLSLIB STREQUAL "openssl")
+    set(comp-flavor "-${TLSUV_TLSLIB}")
+    message(NOTICE "binary marker: ${comp-flavor}")
+endif ()
 macro(BUNDLE_COMP comp)
     add_custom_target(${comp}-bundle
-        BYPRODUCTS ${CMAKE_BINARY_DIR}/bundle/${comp}-${CMAKE_SYSTEM_NAME}_${CMAKE_SYSTEM_PROCESSOR}.zip
+        BYPRODUCTS ${CMAKE_BINARY_DIR}/bundle/${comp}${comp-flavor}-${CMAKE_SYSTEM_NAME}_${CMAKE_SYSTEM_PROCESSOR}.zip
         DEPENDS ${comp}
         # use generator expression to set working directory to the target's build directory. this works for multi-config generators, e.g. when "--config" is specified at build time.
         WORKING_DIRECTORY "$<TARGET_FILE_DIR:${comp}>"
         COMMENT "adding components to bundle ${comp} for ${CMAKE_SYSTEM_NAME}:${CMAKE_SYSTEM_PROCESSOR}: $<TARGET_FILE_NAME:${comp}> ${${comp}_BUNDLE_COMPS}"
-        COMMAND ${CMAKE_COMMAND} -E tar "cf" "${CMAKE_BINARY_DIR}/bundle/${comp}-${CMAKE_SYSTEM_NAME}_${CMAKE_SYSTEM_PROCESSOR}.zip" --format=zip -- $<TARGET_FILE_NAME:${comp}> ${${comp}_BUNDLE_COMPS})
+        COMMAND ${CMAKE_COMMAND} -E tar "cf" "${CMAKE_BINARY_DIR}/bundle/${comp}${comp-flavor}-${CMAKE_SYSTEM_NAME}_${CMAKE_SYSTEM_PROCESSOR}.zip" --format=zip -- $<TARGET_FILE_NAME:${comp}> ${${comp}_BUNDLE_COMPS})
     add_dependencies(bundle ${comp}-bundle)
 endmacro()
 

CMakePresets.json

@@ -150,6 +150,7 @@
       "binaryDir": "${sourceDir}/build",
       "hidden": true,
       "cacheVariables": {
+        "TLSUV_TLSLIB": "openssl",
         "CMAKE_BUILD_TYPE": "RelWithDebInfo"
       }
     },
@@ -266,6 +267,20 @@
         "vcpkg",
         "vcpkg-win64-mingw-static"
       ]
+    },
+    {
+      "name": "ci-windows-x64-win32crypto",
+      "inherits": [
+        "ci-build",
+        "ci-win64-mingw",
+        "dev-mode",
+        "vcpkg",
+        "vcpkg-win64-mingw-static"
+      ],
+      "cacheVariables": {
+        "TLSUV_TLSLIB": "win32crypto"
+      }
     }
+
   ]
 }

vcpkg.json

@@ -12,7 +12,6 @@
     },
     {
       "name": "openssl",
-      "platform": "!windows & !mingw",
       "$comment": "on linux we use system installed OpenSSL, as determined by vcpkg-overlays/linux-syslibs)"
     },
     "json-c",