Fix libsodium dependency in CI workflow and add robust CMake detection

Co-authored-by: 0xrinegade <[email protected]>

Author: Copilot

.github/workflows/cpp_sdk.yml

@@ -37,7 +37,7 @@ jobs:
       if: matrix.os == 'ubuntu-latest'
       run: |
         sudo apt-get update
-        sudo apt-get install -y cmake ninja-build libsodium-dev valgrind
+        sudo apt-get install -y cmake ninja-build libsodium-dev pkg-config valgrind
         if [ "${{ matrix.compiler }}" = "clang" ]; then
           sudo apt-get install -y clang-15
           echo "CC=clang-15" >> $GITHUB_ENV
@@ -47,7 +47,7 @@ jobs:
     - name: Install dependencies (macOS)
       if: matrix.os == 'macos-latest'
       run: |
-        brew install cmake ninja libsodium
+        brew install cmake ninja libsodium pkg-config
         if [ "${{ matrix.compiler }}" = "clang" ]; then
           echo "CC=clang" >> $GITHUB_ENV
           echo "CXX=clang++" >> $GITHUB_ENV
@@ -56,9 +56,10 @@ jobs:
     - name: Install dependencies (Windows)
       if: matrix.os == 'windows-latest'
       run: |
-        choco install cmake ninja
-        vcpkg install libsodium:x64-windows
+        choco install cmake ninja pkgconfiglite
+        vcpkg install libsodium:x64-windows pkgconf:x64-windows
         echo "CMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake" >> $env:GITHUB_ENV
+        echo "PKG_CONFIG_PATH=C:/vcpkg/installed/x64-windows/lib/pkgconfig" >> $env:GITHUB_ENV
         if ("${{ matrix.compiler }}" -eq "msvc") {
           echo "Using MSVC compiler"
         } else {
@@ -142,7 +143,7 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install -y cmake ninja-build libsodium-dev valgrind clang-15
+        sudo apt-get install -y cmake ninja-build libsodium-dev pkg-config valgrind clang-15
         echo "CC=clang-15" >> $GITHUB_ENV
         echo "CXX=clang++-15" >> $GITHUB_ENV
     
@@ -195,7 +196,7 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install -y cmake ninja-build libsodium-dev clang-15 clang-tidy-15
+        sudo apt-get install -y cmake ninja-build libsodium-dev pkg-config clang-15 clang-tidy-15
         echo "CC=clang-15" >> $GITHUB_ENV
         echo "CXX=clang++-15" >> $GITHUB_ENV
     

cpp_sdk/CMakeLists.txt

@@ -49,10 +49,38 @@ if(ENABLE_VALGRIND)
 endif()
 
 # Find required packages
-find_package(PkgConfig REQUIRED)
+find_package(PkgConfig)
 
 # Find libsodium
-pkg_check_modules(LIBSODIUM REQUIRED libsodium)
+if(PkgConfig_FOUND)
+    pkg_check_modules(LIBSODIUM libsodium)
+endif()
+
+# Fallback for systems without pkg-config or if libsodium is not found via pkg-config
+if(NOT LIBSODIUM_FOUND)
+    find_path(LIBSODIUM_INCLUDE_DIR sodium.h
+        PATHS /usr/include /usr/local/include /opt/local/include
+              ${CMAKE_PREFIX_PATH}/include
+        PATH_SUFFIXES sodium
+    )
+    
+    find_library(LIBSODIUM_LIBRARY
+        NAMES sodium libsodium
+        PATHS /usr/lib /usr/local/lib /opt/local/lib
+              ${CMAKE_PREFIX_PATH}/lib
+    )
+    
+    if(LIBSODIUM_INCLUDE_DIR AND LIBSODIUM_LIBRARY)
+        set(LIBSODIUM_FOUND TRUE)
+        set(LIBSODIUM_INCLUDE_DIRS ${LIBSODIUM_INCLUDE_DIR})
+        set(LIBSODIUM_LIBRARIES ${LIBSODIUM_LIBRARY})
+        message(STATUS "Found libsodium: ${LIBSODIUM_LIBRARY}")
+    endif()
+endif()
+
+if(NOT LIBSODIUM_FOUND)
+    message(FATAL_ERROR "libsodium not found! Please install libsodium development package.")
+endif()
 
 # Include directories
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)