add marker to bundle with non-standard(openssl) TLS engine

Author: ekoby

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

@@ -269,7 +269,7 @@
       ]
     },
     {
-      "name": "ci-windows-x64-win32cryptoo",
+      "name": "ci-windows-x64-win32crypto",
       "inherits": [
         "ci-build",
         "ci-win64-mingw",