zswag 1.9.2.dev14__tar.gz → 1.9.2.dev21__tar.gz

{zswag-1.9.2.dev14 → zswag-1.9.2.dev21}/.github/workflows/build-deploy.yml

@@ -48,6 +48,8 @@ jobs:
           echo "Node at $(which node): $(node -v); npm: $(npm -v)"
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          submodules: recursive
       - name: Configure
         run: |
           python3 -m venv venv && . ./venv/bin/activate
@@ -124,8 +126,8 @@ jobs:
       if: matrix.os == 'windows-latest'
       working-directory: build
       run: |
-        # Install NASM using chocolatey (required for OpenSSL build)
-        choco install nasm -y
+        # Install NASM and jom using chocolatey (required for OpenSSL build)
+        choco install nasm jom -y
         # Add NASM to PATH for current session
         $env:PATH = "$env:PATH;C:\Program Files\NASM"
         # Verify NASM installation
@@ -155,7 +157,7 @@ jobs:
         with:
           fetch-depth: 0
           fetch-tags: true
-      
+
       - name: Setup Python
         uses: actions/setup-python@v5
         with:

zswag-1.9.2.dev21/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "cmake/CPM.cmake"]
+	path = cmake/CPM.cmake
+	url = https://github.com/cpm-cmake/CPM.cmake.git

{zswag-1.9.2.dev14 → zswag-1.9.2.dev21}/CMakeLists.txt

@@ -10,7 +10,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 # without requiring CMakeLists.txt updates between releases.
 # For official releases, this value should match the git tag.
 if(NOT DEFINED ZSWAG_VERSION)
-  set(ZSWAG_VERSION 1.9.1)
+  set(ZSWAG_VERSION 1.10.0)
 endif()
 
 option(ZSWAG_BUILD_WHEELS "Enable zswag whl-output to WHEEL_DEPLOY_DIRECTORY." ON)
@@ -41,9 +41,14 @@ set (CMAKE_LIBRARY_OUTPUT_DIRECTORY "${ZSWAG_DEPLOY_DIR}")
 set (CMAKE_RUNTIME_OUTPUT_DIRECTORY "${ZSWAG_DEPLOY_DIR}")
 
 ##############
-# Dependencies via FetchContent
-
-# Include centralized dependency management
+# Dependencies via CPM (CMake Package Manager)
+
+set(CPM_DOWNLOAD_ALL ON)
+set(CPM_USE_LOCAL_PACKAGES OFF)
+# Include CPM.cmake
+if (NOT CPM_INITIALIZED)
+  add_subdirectory(cmake/CPM.cmake)
+endif ()
 include(cmake/Dependencies.cmake)
 
 ##############

{zswag-1.9.2.dev14 → zswag-1.9.2.dev21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zswag
-Version: 1.9.2.dev14
+Version: 1.9.2.dev21
 Summary: OpenAPI service transport layer for zserio.
 Home-page: https://github.com/klebert-engineering/zswag
 Author: Klebert Engineering

zswag-1.9.2.dev21/cmake/Dependencies.cmake

@@ -0,0 +1,121 @@
+# Dependencies.cmake
+# Centralized dependency management using CPM (CMake Package Manager)
+# CPM provides better version management and diagnostics compared to raw FetchContent
+
+# =============================================================================
+# Core dependencies
+# =============================================================================
+
+# zlib
+CPMAddPackage(
+    URI "gh:madler/zlib@1.3.1"
+    OPTIONS
+        "ZLIB_BUILD_EXAMPLES OFF"
+        "BUILD_TESTING OFF")
+if(zlib_ADDED)
+    set_target_properties(zlib PROPERTIES EXCLUDE_FROM_ALL TRUE)
+    set_target_properties(zlibstatic PROPERTIES EXCLUDE_FROM_ALL TRUE)
+    # Create ZLIB::ZLIB alias if it doesn't exist
+    if(NOT TARGET ZLIB::ZLIB)
+        if(TARGET zlib)
+            add_library(ZLIB::ZLIB ALIAS zlib)
+        elseif(TARGET zlibstatic)
+            add_library(ZLIB::ZLIB ALIAS zlibstatic)
+        endif()
+    endif()
+endif()
+
+# fmt
+CPMAddPackage(
+    URI "gh:fmtlib/fmt#11.1.3"
+    OPTIONS "FMT_HEADER_ONLY OFF"
+)
+
+# spdlog
+CPMAddPackage(
+    URI "gh:gabime/spdlog@1.15.3"
+    OPTIONS
+        "SPDLOG_BUILD_TESTS OFF"
+        "SPDLOG_BUILD_EXAMPLE OFF"
+        "SPDLOG_FMT_EXTERNAL ON"
+)
+
+# yaml-cpp
+CPMAddPackage(
+    URI "gh:jbeder/yaml-cpp#aa8d4e4750ec9fe9f8cc680eb90f1b15955c817e"
+    OPTIONS
+        "YAML_CPP_BUILD_TESTS OFF"
+        "YAML_CPP_BUILD_TOOLS OFF"
+        "YAML_CPP_BUILD_CONTRIB OFF"
+)
+
+# stx
+CPMAddPackage("gh:Klebert-Engineering/stx@1.0.0")
+
+# httplib
+CPMAddPackage(
+    URI "gh:yhirose/cpp-httplib@0.15.3"
+    OPTIONS
+        "HTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN OFF"
+        "HTTPLIB_INSTALL OFF"
+)
+
+# OpenSSL
+set (OPENSSL_VERSION openssl-3.5.2)
+CPMAddPackage("gh:klebert-engineering/openssl-cmake@1.0.0")
+
+# pybind11 (only needed when building wheels)
+if(ZSWAG_BUILD_WHEELS)
+    CPMAddPackage("gh:pybind/pybind11@2.13.6")
+endif()
+
+# python-cmake-wheel (only needed when building wheels)
+if(ZSWAG_BUILD_WHEELS)
+    CPMAddPackage("gh:Klebert-Engineering/python-cmake-wheel@1.0.1")
+endif()
+
+# keychain
+if(ZSWAG_KEYCHAIN_SUPPORT)
+    CPMAddPackage("gh:hrantzsch/keychain@1.3.1")
+endif()
+
+# Catch2 (for testing)
+if(ZSWAG_ENABLE_TESTING)
+    CPMAddPackage(
+        URI "gh:catchorg/Catch2@3.8.1"
+        OPTIONS
+            "CATCH_INSTALL_DOCS OFF"
+            "CATCH_INSTALL_EXTRAS OFF"
+    )
+endif()
+
+# zserio-cmake-helper
+set(ZSERIO_VERSION "2.16.1")
+CPMAddPackage("gh:Klebert-Engineering/zserio-cmake-helper@1.1.4")
+# Add zserio C++ runtime target
+if(NOT TARGET ZserioCppRuntime)
+    add_zserio_cpp_runtime()
+endif()
+
+# =============================================================================
+# Configure httplib with OpenSSL and zlib support
+# =============================================================================
+
+if (TARGET httplib)
+    target_compile_definitions(httplib INTERFACE CPPHTTPLIB_OPENSSL_SUPPORT)
+    target_link_libraries(httplib INTERFACE OpenSSL::SSL OpenSSL::Crypto ZLIB::ZLIB)
+endif()
+
+# =============================================================================
+# Configure python-cmake-wheel integration
+# =============================================================================
+
+if(ZSWAG_BUILD_WHEELS AND python-cmake-wheel_ADDED)
+    set(CMAKE_MODULE_PATH "${python-cmake-wheel_SOURCE_DIR}" ${CMAKE_MODULE_PATH})
+    
+    if(NOT TARGET wheel)
+        set(Python3_FIND_STRATEGY LOCATION)
+        include(python-wheel)
+        set(WHEEL_DEPLOY_DIRECTORY "${ZSWAG_DEPLOY_DIR}/wheel")
+    endif()
+endif()

{zswag-1.9.2.dev14 → zswag-1.9.2.dev21}/libs/zswag.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zswag
-Version: 1.9.2.dev14
+Version: 1.9.2.dev21
 Summary: OpenAPI service transport layer for zserio.
 Home-page: https://github.com/klebert-engineering/zswag
 Author: Klebert Engineering

{zswag-1.9.2.dev14 → zswag-1.9.2.dev21}/libs/zswag.egg-info/SOURCES.txt

@@ -1,5 +1,6 @@
 .clang-format
 .gitignore
+.gitmodules
 CMakeLists.txt
 LICENSE
 README.md
@@ -10,7 +11,6 @@ setup.py
 .github/scripts/validate_version.py
 .github/workflows/build-deploy.yml
 cmake/Dependencies.cmake
-cmake/OpenSSL.cmake
 doc/zswag-architecture.mdj
 doc/zswag-architecture.png
 libs/httpcl/CMakeLists.txt

{zswag-1.9.2.dev14 → zswag-1.9.2.dev21}/libs/zswag.egg-info/requires.txt

@@ -1,4 +1,4 @@
-pyzswagcl==1.9.2.dev14
+pyzswagcl==1.9.2.dev21
 connexion~=2.14.2
 requests
 zserio<3.0.0

{zswag-1.9.2.dev14 → zswag-1.9.2.dev21}/libs/zswagcl/test/src/oauth2-integration-test.cpp

@@ -289,3 +289,4 @@ TEST_CASE("OAuth2 Integration with OpenAPI Parser", "[oauth2][integration]") {
         REQUIRE(tokenEndpointCalled);
     }
 }
+

{zswag-1.9.2.dev14 → zswag-1.9.2.dev21}/libs/zswagcl/test/src/oauth2-test.cpp

@@ -463,3 +463,4 @@ TEST_CASE("OAuth2 Client Credentials Flow", "[oauth2]") {
         oaClient->callMethod("test", zserio::ReflectableServiceData(request.reflectable()), nullptr);
     }
 }
+

{zswag-1.9.2.dev14 → zswag-1.9.2.dev21}/libs/zswagcl/test/testdata/oauth2-openapi.yaml

@@ -57,3 +57,4 @@ components:
             read: Read access
             write: Write access
             admin: Admin access
+

zswag-1.9.2.dev14/cmake/Dependencies.cmake

@@ -1,223 +0,0 @@
-# Dependencies.cmake
-# Centralized dependency management using FetchContent
-
-include(FetchContent)
-
-# Option to enable offline builds
-option(FETCHCONTENT_FULLY_DISCONNECTED "Enable offline build mode" OFF)
-
-# Set FetchContent properties
-set(FETCHCONTENT_QUIET OFF)
-
-# =============================================================================
-# Local override checks and messages
-# =============================================================================
-
-macro(check_fetchcontent_override dep_name)
-    if(FETCHCONTENT_SOURCE_DIR_${dep_name})
-        message(STATUS "Using local source for ${dep_name}: ${FETCHCONTENT_SOURCE_DIR_${dep_name}}")
-    endif()
-endmacro()
-
-# =============================================================================
-# Core dependencies
-# =============================================================================
-
-# zlib
-if(NOT TARGET zlib AND NOT TARGET zlibstatic AND NOT TARGET ZLIB::ZLIB)
-    check_fetchcontent_override(ZLIB)
-    FetchContent_Declare(
-        zlib
-        GIT_REPOSITORY https://github.com/madler/zlib.git
-        GIT_TAG        "v1.3.1"
-        GIT_SHALLOW    TRUE
-    )
-    set(ZLIB_BUILD_TESTS OFF CACHE BOOL "" FORCE)
-    set(ZLIB_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
-    FetchContent_MakeAvailable(zlib)
-endif()
-
-# create ZLIB::ZLIB alias if it doesn't exist
-if(NOT TARGET ZLIB::ZLIB)
-    if(TARGET zlib)
-        add_library(ZLIB::ZLIB ALIAS zlib)
-    elseif(TARGET zlibstatic)
-        add_library(ZLIB::ZLIB ALIAS zlibstatic)
-    endif()
-endif()
-
-# fmt
-if (NOT TARGET fmt::fmt)
-    FetchContent_Declare(fmt
-            GIT_REPOSITORY "https://github.com/fmtlib/fmt.git"
-            GIT_TAG        "11.1.3"
-            GIT_SHALLOW    ON
-            CMAKE_ARGS     -DFMT_HEADER_ONLY=OFF)
-    FetchContent_MakeAvailable(fmt)
-endif()
-
-# spdlog
-if(NOT TARGET spdlog)
-    check_fetchcontent_override(SPDLOG)
-    FetchContent_Declare(
-        spdlog
-        GIT_REPOSITORY https://github.com/gabime/spdlog.git
-        GIT_TAG        "v1.15.3"
-        GIT_SHALLOW    TRUE
-    )
-    set(SPDLOG_BUILD_TESTS OFF CACHE BOOL "" FORCE)
-    set(SPDLOG_BUILD_EXAMPLE OFF CACHE BOOL "" FORCE)
-    set(SPDLOG_FMT_EXTERNAL ON CACHE BOOL "" FORCE)
-    FetchContent_MakeAvailable(spdlog)
-endif()
-
-# yaml-cpp - use specific commit hash for stability
-if(NOT TARGET yaml-cpp)
-    check_fetchcontent_override(YAML_CPP)
-    FetchContent_Declare(
-        yaml-cpp
-        GIT_REPOSITORY https://github.com/jbeder/yaml-cpp.git
-        GIT_TAG        "aa8d4e4750ec9fe9f8cc680eb90f1b15955c817e"  # Latest commit on master as of Dec 2024
-        GIT_SHALLOW    TRUE
-    )
-    set(YAML_CPP_BUILD_TESTS OFF CACHE BOOL "" FORCE)
-    set(YAML_CPP_BUILD_TOOLS OFF CACHE BOOL "" FORCE)
-    set(YAML_CPP_BUILD_CONTRIB OFF CACHE BOOL "" FORCE)
-    FetchContent_MakeAvailable(yaml-cpp)
-endif()
-
-# stx - use specific commit hash for stability
-if(NOT TARGET stx)
-    check_fetchcontent_override(STX)
-    FetchContent_Declare(
-        stx
-        GIT_REPOSITORY https://github.com/Klebert-Engineering/stx.git
-        GIT_TAG        "019d7e4978a7e60ac90223a96ad87963840308ef"  # Latest commit on main as of Dec 2024
-        GIT_SHALLOW    TRUE
-    )
-    FetchContent_MakeAvailable(stx)
-endif()
-
-# httplib - configure to not install/export targets to avoid dependency issues
-if(NOT TARGET httplib)
-    check_fetchcontent_override(HTTPLIB)
-    FetchContent_Declare(
-        httplib
-        GIT_REPOSITORY https://github.com/yhirose/cpp-httplib.git
-        GIT_TAG        "v0.15.3"
-        GIT_SHALLOW    TRUE
-    )
-    set(HTTPLIB_USE_CERTS_FROM_MACOSX_KEYCHAIN OFF CACHE BOOL "" FORCE)
-    set(HTTPLIB_INSTALL OFF CACHE BOOL "" FORCE)  # Disable installation to avoid export issues
-    FetchContent_MakeAvailable(httplib)
-endif()
-
-# OpenSSL
-if(NOT TARGET OpenSSL::SSL AND NOT TARGET OpenSSL::Crypto)
-    check_fetchcontent_override(OPENSSL)
-    FetchContent_Declare(
-        openssl
-        GIT_REPOSITORY https://github.com/openssl/openssl.git
-        GIT_TAG        "openssl-3.5.1"
-        GIT_SHALLOW    TRUE
-    )
-    FetchContent_MakeAvailable(openssl)
-    set(OPENSSL_SOURCE_DIR ${openssl_SOURCE_DIR})
-    # Include the OpenSSL build logic
-    include(${CMAKE_CURRENT_LIST_DIR}/OpenSSL.cmake)
-endif()
-
-# pybind11 (only needed when building wheels)
-if(ZSWAG_BUILD_WHEELS AND NOT TARGET pybind11)
-    check_fetchcontent_override(PYBIND11)
-    FetchContent_Declare(
-        pybind11
-        GIT_REPOSITORY https://github.com/pybind/pybind11.git
-        GIT_TAG        "v2.10.4"
-        GIT_SHALLOW    TRUE
-    )
-    FetchContent_MakeAvailable(pybind11)
-endif()
-
-# python-cmake-wheel (only needed when building wheels)
-if(ZSWAG_BUILD_WHEELS AND NOT TARGET wheel)
-    check_fetchcontent_override(PYTHON_CMAKE_WHEEL)
-    FetchContent_Declare(
-        python-cmake-wheel
-        GIT_REPOSITORY https://github.com/Klebert-Engineering/python-cmake-wheel.git
-        GIT_TAG        "v1.0.0"
-        GIT_SHALLOW    TRUE
-    )
-    FetchContent_MakeAvailable(python-cmake-wheel)
-endif()
-
-# keychain
-if(ZSWAG_KEYCHAIN_SUPPORT AND NOT TARGET keychain)
-    check_fetchcontent_override(KEYCHAIN)
-    FetchContent_Declare(
-        keychain
-        GIT_REPOSITORY https://github.com/hrantzsch/keychain
-        GIT_TAG        "v1.3.1"
-        GIT_SHALLOW    TRUE
-    )
-    FetchContent_MakeAvailable(keychain)
-endif()
-
-# Catch2 (for testing)
-if(ZSWAG_ENABLE_TESTING AND NOT TARGET Catch2::Catch2)
-    check_fetchcontent_override(CATCH2)
-    FetchContent_Declare(
-        catch2
-        GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-        GIT_TAG        "v3.8.1"
-        GIT_SHALLOW    TRUE
-    )
-    set(CATCH_INSTALL_DOCS OFF CACHE BOOL "" FORCE)
-    set(CATCH_INSTALL_EXTRAS OFF CACHE BOOL "" FORCE)
-    FetchContent_MakeAvailable(catch2)
-endif()
-
-# zserio-cmake-helper
-if(NOT COMMAND add_zserio_cpp_runtime)
-    check_fetchcontent_override(ZSERIO_CMAKE_HELPER)
-    FetchContent_Declare(
-        zserio-cmake-helper
-        GIT_REPOSITORY https://github.com/Klebert-Engineering/zserio-cmake-helper.git
-        GIT_TAG        "v1.1.4"
-        GIT_SHALLOW    TRUE
-    )
-    set(ZSERIO_VERSION "2.16.1")
-    FetchContent_MakeAvailable(zserio-cmake-helper)
-
-    # Add zserio C++ runtime target
-    if(NOT TARGET ZserioCppRuntime)
-        add_zserio_cpp_runtime()
-    endif() 
-endif()
-
-# =============================================================================
-# Configure httplib with OpenSSL and zlib support
-# =============================================================================
-
-if(TARGET httplib)
-    target_compile_definitions(httplib INTERFACE CPPHTTPLIB_OPENSSL_SUPPORT)
-    target_link_libraries(httplib INTERFACE OpenSSL::SSL OpenSSL::Crypto ZLIB::ZLIB)
-    # Ensure httplib depends on OpenSSL build to establish correct build order
-    if(TARGET openssl_build)
-        add_dependencies(httplib openssl_build)
-    endif()
-endif()
-
-# =============================================================================
-# Configure python-cmake-wheel integration
-# =============================================================================
-
-if(ZSWAG_BUILD_WHEELS)
-    set(CMAKE_MODULE_PATH "${python-cmake-wheel_SOURCE_DIR}" ${CMAKE_MODULE_PATH})
-    
-    if(NOT TARGET wheel)
-        set(Python3_FIND_STRATEGY LOCATION)
-        include(python-wheel)
-        set(WHEEL_DEPLOY_DIRECTORY "${ZSWAG_DEPLOY_DIR}/wheel")
-    endif()
-endif()

zswag-1.9.2.dev14/cmake/OpenSSL.cmake

@@ -1,175 +0,0 @@
-# OpenSSL.cmake
-# Custom OpenSSL build configuration using ExternalProject
-
-include(ExternalProject)
-include(ProcessorCount)
-
-# Get number of processor cores for parallel builds
-ProcessorCount(N)
-
-# Set OpenSSL install directory
-set(OPENSSL_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/_deps/openssl-install)
-
-# Use find_package so Perl executable can be set in cmake
-find_package(Perl REQUIRED)
-
-# Determine platform-specific OpenSSL configuration
-if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-        set(OPENSSL_CONFIGURE_COMMAND ${PERL_EXECUTABLE} ${OPENSSL_SOURCE_DIR}/Configure VC-WIN64A --prefix=${OPENSSL_INSTALL_DIR} --openssldir=${OPENSSL_INSTALL_DIR}/ssl no-shared no-tests)
-    else()
-        set(OPENSSL_CONFIGURE_COMMAND ${PERL_EXECUTABLE} ${OPENSSL_SOURCE_DIR}/Configure VC-WIN32 --prefix=${OPENSSL_INSTALL_DIR} --openssldir=${OPENSSL_INSTALL_DIR}/ssl no-shared no-tests)
-    endif()
-    set(OPENSSL_BUILD_COMMAND nmake)
-    set(OPENSSL_INSTALL_COMMAND nmake install_sw)
-    # On Windows, OpenSSL may generate libraries with lib prefix
-    set(OPENSSL_LIB_PREFIX "lib")
-    set(OPENSSL_LIB_SUFFIX ".lib")
-elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-    if(CMAKE_OSX_ARCHITECTURES MATCHES "arm64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "arm64")
-        set(OPENSSL_CONFIGURE_COMMAND ${OPENSSL_SOURCE_DIR}/Configure darwin64-arm64-cc --prefix=${OPENSSL_INSTALL_DIR} --openssldir=${OPENSSL_INSTALL_DIR}/ssl no-shared no-tests)
-    else()
-        set(OPENSSL_CONFIGURE_COMMAND ${OPENSSL_SOURCE_DIR}/Configure darwin64-x86_64-cc --prefix=${OPENSSL_INSTALL_DIR} --openssldir=${OPENSSL_INSTALL_DIR}/ssl no-shared no-tests)
-    endif()
-    if(NOT N EQUAL 0)
-        set(OPENSSL_BUILD_COMMAND make -j${N})
-        set(OPENSSL_INSTALL_COMMAND make -j${N} install_sw)
-    else()
-        set(OPENSSL_BUILD_COMMAND make)
-        set(OPENSSL_INSTALL_COMMAND make install_sw)
-    endif()
-    set(OPENSSL_LIB_PREFIX "lib")
-    set(OPENSSL_LIB_SUFFIX ".a")
-else() # Linux and other Unix-like systems
-    # Detect architecture for Linux
-    if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|arm64|ARM64")
-        set(OPENSSL_CONFIGURE_COMMAND ${OPENSSL_SOURCE_DIR}/Configure linux-aarch64 --prefix=${OPENSSL_INSTALL_DIR} --openssldir=${OPENSSL_INSTALL_DIR}/ssl no-shared no-tests)
-    elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
-        set(OPENSSL_CONFIGURE_COMMAND ${OPENSSL_SOURCE_DIR}/Configure linux-x86_64 --prefix=${OPENSSL_INSTALL_DIR} --openssldir=${OPENSSL_INSTALL_DIR}/ssl no-shared no-tests)
-    else()
-        set(OPENSSL_CONFIGURE_COMMAND ${OPENSSL_SOURCE_DIR}/Configure linux-x86 --prefix=${OPENSSL_INSTALL_DIR} --openssldir=${OPENSSL_INSTALL_DIR}/ssl no-shared no-tests)
-    endif()
-    if(NOT N EQUAL 0)
-        set(OPENSSL_BUILD_COMMAND make -j${N})
-        set(OPENSSL_INSTALL_COMMAND make -j${N} install_sw)
-    else()
-        set(OPENSSL_BUILD_COMMAND make)
-        set(OPENSSL_INSTALL_COMMAND make install_sw)
-    endif()
-    set(OPENSSL_LIB_PREFIX "lib")
-    set(OPENSSL_LIB_SUFFIX ".a")
-endif()
-
-# Determine the library directory used by OpenSSL on Linux
-# x86_64 Linux uses lib64, but ARM64 uses lib
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|arm64|ARM64")
-    set(OPENSSL_LIBDIR "lib")
-elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    set(OPENSSL_LIBDIR "lib64")
-else()
-    set(OPENSSL_LIBDIR "lib")
-endif()
-
-# Build OpenSSL using ExternalProject
-ExternalProject_Add(openssl_build
-    SOURCE_DIR ${OPENSSL_SOURCE_DIR}
-    CONFIGURE_COMMAND ${OPENSSL_CONFIGURE_COMMAND}
-    BUILD_COMMAND ${OPENSSL_BUILD_COMMAND}
-    INSTALL_COMMAND ${OPENSSL_INSTALL_COMMAND}
-    BUILD_IN_SOURCE 1
-    BUILD_BYPRODUCTS 
-        $<$<STREQUAL:${CMAKE_SYSTEM_NAME},Windows>:${OPENSSL_INSTALL_DIR}/lib/${OPENSSL_LIB_PREFIX}ssl${OPENSSL_LIB_SUFFIX}>
-        $<$<STREQUAL:${CMAKE_SYSTEM_NAME},Windows>:${OPENSSL_INSTALL_DIR}/lib/${OPENSSL_LIB_PREFIX}crypto${OPENSSL_LIB_SUFFIX}>
-        $<$<STREQUAL:${CMAKE_SYSTEM_NAME},Windows>:${OPENSSL_INSTALL_DIR}/lib/ssl${OPENSSL_LIB_SUFFIX}>
-        $<$<STREQUAL:${CMAKE_SYSTEM_NAME},Windows>:${OPENSSL_INSTALL_DIR}/lib/crypto${OPENSSL_LIB_SUFFIX}>
-        $<$<STREQUAL:${CMAKE_SYSTEM_NAME},Linux>:${OPENSSL_INSTALL_DIR}/${OPENSSL_LIBDIR}/${OPENSSL_LIB_PREFIX}ssl${OPENSSL_LIB_SUFFIX}>
-        $<$<STREQUAL:${CMAKE_SYSTEM_NAME},Linux>:${OPENSSL_INSTALL_DIR}/${OPENSSL_LIBDIR}/${OPENSSL_LIB_PREFIX}crypto${OPENSSL_LIB_SUFFIX}>
-        $<$<AND:$<STREQUAL:${CMAKE_SYSTEM_NAME},Linux>,$<NOT:$<STREQUAL:${OPENSSL_LIBDIR},lib>>>:${OPENSSL_INSTALL_DIR}/lib/${OPENSSL_LIB_PREFIX}ssl${OPENSSL_LIB_SUFFIX}>
-        $<$<AND:$<STREQUAL:${CMAKE_SYSTEM_NAME},Linux>,$<NOT:$<STREQUAL:${OPENSSL_LIBDIR},lib>>>:${OPENSSL_INSTALL_DIR}/lib/${OPENSSL_LIB_PREFIX}crypto${OPENSSL_LIB_SUFFIX}>
-        $<$<STREQUAL:${CMAKE_SYSTEM_NAME},Darwin>:${OPENSSL_INSTALL_DIR}/lib/${OPENSSL_LIB_PREFIX}ssl${OPENSSL_LIB_SUFFIX}>
-        $<$<STREQUAL:${CMAKE_SYSTEM_NAME},Darwin>:${OPENSSL_INSTALL_DIR}/lib/${OPENSSL_LIB_PREFIX}crypto${OPENSSL_LIB_SUFFIX}>
-    LOG_CONFIGURE ON
-    LOG_BUILD ON
-    LOG_INSTALL ON
-    LOG_OUTPUT_ON_FAILURE ON
-)
-
-# Create imported targets for OpenSSL::SSL and OpenSSL::Crypto
-add_library(OpenSSL::SSL STATIC IMPORTED GLOBAL)
-add_library(OpenSSL::Crypto STATIC IMPORTED GLOBAL)
-
-# Set target properties - use standard lib path
-# On Windows, try both naming conventions
-if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    set_target_properties(OpenSSL::SSL PROPERTIES
-        IMPORTED_LOCATION ${OPENSSL_INSTALL_DIR}/lib/ssl${OPENSSL_LIB_SUFFIX}
-        INTERFACE_INCLUDE_DIRECTORIES ${OPENSSL_INSTALL_DIR}/include
-    )
-    set_target_properties(OpenSSL::Crypto PROPERTIES
-        IMPORTED_LOCATION ${OPENSSL_INSTALL_DIR}/lib/crypto${OPENSSL_LIB_SUFFIX}
-        INTERFACE_INCLUDE_DIRECTORIES ${OPENSSL_INSTALL_DIR}/include
-    )
-else()
-    set_target_properties(OpenSSL::SSL PROPERTIES
-        IMPORTED_LOCATION ${OPENSSL_INSTALL_DIR}/lib/${OPENSSL_LIB_PREFIX}ssl${OPENSSL_LIB_SUFFIX}
-        INTERFACE_INCLUDE_DIRECTORIES ${OPENSSL_INSTALL_DIR}/include
-    )
-    set_target_properties(OpenSSL::Crypto PROPERTIES
-        IMPORTED_LOCATION ${OPENSSL_INSTALL_DIR}/lib/${OPENSSL_LIB_PREFIX}crypto${OPENSSL_LIB_SUFFIX}
-        INTERFACE_INCLUDE_DIRECTORIES ${OPENSSL_INSTALL_DIR}/include
-    )
-endif()
-
-# Add a post-build command to handle lib64 vs lib directory issue on Linux x86_64 systems only
-# This ensures libraries are available in the expected lib/ directory
-# macOS and ARM64 Linux install directly to lib/, so this is only needed for x86_64 Linux
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|arm64|ARM64")
-    add_custom_command(
-        TARGET openssl_build POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E make_directory ${OPENSSL_INSTALL_DIR}/lib
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different 
-            ${OPENSSL_INSTALL_DIR}/lib64/${OPENSSL_LIB_PREFIX}ssl${OPENSSL_LIB_SUFFIX} 
-            ${OPENSSL_INSTALL_DIR}/lib/${OPENSSL_LIB_PREFIX}ssl${OPENSSL_LIB_SUFFIX}
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different 
-            ${OPENSSL_INSTALL_DIR}/lib64/${OPENSSL_LIB_PREFIX}crypto${OPENSSL_LIB_SUFFIX} 
-            ${OPENSSL_INSTALL_DIR}/lib/${OPENSSL_LIB_PREFIX}crypto${OPENSSL_LIB_SUFFIX}
-        COMMENT "Ensuring OpenSSL libraries are available in lib/ directory"
-        VERBATIM
-    )
-endif()
-
-# Add a post-build command to handle library naming issues on Windows
-# OpenSSL may generate libraries with different names, so we create fallback copies
-if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    add_custom_command(
-        TARGET openssl_build POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different 
-            ${OPENSSL_INSTALL_DIR}/lib/${OPENSSL_LIB_PREFIX}ssl${OPENSSL_LIB_SUFFIX} 
-            ${OPENSSL_INSTALL_DIR}/lib/ssl${OPENSSL_LIB_SUFFIX}
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different 
-            ${OPENSSL_INSTALL_DIR}/lib/${OPENSSL_LIB_PREFIX}crypto${OPENSSL_LIB_SUFFIX} 
-            ${OPENSSL_INSTALL_DIR}/lib/crypto${OPENSSL_LIB_SUFFIX}
-        COMMENT "Ensuring OpenSSL libraries are available with expected names"
-        VERBATIM
-    )
-endif()
-
-# Add dependencies
-add_dependencies(OpenSSL::SSL openssl_build)
-add_dependencies(OpenSSL::Crypto openssl_build)
-
-# Link SSL to Crypto
-set_target_properties(OpenSSL::SSL PROPERTIES
-    INTERFACE_LINK_LIBRARIES OpenSSL::Crypto
-)
-
-# Platform-specific system libraries
-if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    set_target_properties(OpenSSL::Crypto PROPERTIES
-        INTERFACE_LINK_LIBRARIES "ws2_32;gdi32;advapi32;crypt32;user32"
-    )
-elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    set_target_properties(OpenSSL::Crypto PROPERTIES
-        INTERFACE_LINK_LIBRARIES "dl;pthread"
-    )
-endif()