Fix MySQL header include path

.github/workflows/cmake-multi-platform.yml

@@ -1,75 +1,96 @@
-# This starter workflow is for a CMake project running on multiple platforms. There is a different starter workflow if you just want a single platform.
-# See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-single-platform.yml
 name: CMake on multiple platforms
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "main", "master" ]
   pull_request:
-    branches: [ "master" ]
 
 jobs:
+
   build:
-    runs-on: ${{ matrix.os }}
 
     strategy:
-      # Set fail-fast to false to ensure that feedback is delivered for all matrix combinations. Consider changing this to true when your workflow is stable.
       fail-fast: false
 
-      # Set up a matrix to run the following 3 configurations:
-      # 1. <Windows, Release, latest MSVC compiler toolchain on the default runner image, default generator>
-      # 2. <Linux, Release, latest GCC compiler toolchain on the default runner image, default generator>
-      # 3. <Linux, Release, latest Clang compiler toolchain on the default runner image, default generator>
-      #
-      # To add more build types (Release, Debug, RelWithDebInfo, etc.) customize the build_type list.
       matrix:
-        os: [ubuntu-latest, windows-latest]
-        build_type: [Release]
-        c_compiler: [gcc, clang, cl]
         include:
-          - os: windows-latest
-            c_compiler: cl
-            cpp_compiler: cl
+
           - os: ubuntu-latest
-            c_compiler: gcc
-            cpp_compiler: g++
+            compiler: gcc
+            cc: gcc
+            cxx: g++
+
           - os: ubuntu-latest
-            c_compiler: clang
-            cpp_compiler: clang++
-        exclude:
-          - os: windows-latest
-            c_compiler: gcc
+            compiler: clang
+            cc: clang
+            cxx: clang++
+
           - os: windows-latest
-            c_compiler: clang
-          - os: ubuntu-latest
-            c_compiler: cl
+            compiler: msvc
+
+    runs-on: ${{ matrix.os }}
 
     steps:
+
     - uses: actions/checkout@v4
 
-    - name: Set reusable strings
-      # Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file.
-      id: strings
-      shell: bash
+    ####################################################
+    # Ubuntu
+    ####################################################
+
+    - name: Install Linux dependencies
+      if: runner.os == 'Linux'
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y \
+          default-libmysqlclient-dev \
+          pkg-config
+
+    ####################################################
+    # Windows
+    ####################################################
+
+    - name: Install MySQL via vcpkg
+      if: runner.os == 'Windows'
       run: |
-        echo "build-output-dir=${{ github.workspace }}/build"  >> "$GITHUB_OUTPUT"
-
-    - name: Configure CMake
-      # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
-      # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-      run: >
-        cmake -B ${{ steps.strings.outputs.build-output-dir }}
-        -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
-        -DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
-        -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
-        -S ${{ github.workspace }}
+        git clone https://github.com/microsoft/vcpkg.git
+        ./vcpkg/bootstrap-vcpkg.bat
+        ./vcpkg/vcpkg install libmysql:x64-windows
+
+    - name: Show installed packages
+     if: runner.os == 'Windows'
+     run: |
+        dir vcpkg\installed\x64-windows\share
+
+    ####################################################
+    # Configure
+    ####################################################
+
+    - name: Configure
+      env:
+        CC: ${{ matrix.cc }}
+        CXX: ${{ matrix.cxx }}
+      run: |
+        if [ "${{ runner.os }}" = "Windows" ]; then
+          cmake -B build \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake
+        else
+          cmake -B build \
+            -DCMAKE_BUILD_TYPE=Release
+        fi
+      shell: bash
+
+    ####################################################
+    # Build
+    ####################################################
 
     - name: Build
-      # Build your program with the given configuration. Note that --config is needed because the default Windows generator is a multi-config generator (Visual Studio generator).
-      run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }}
+      run: cmake --build build --config Release
+
+    ####################################################
+    # Test
+    ####################################################
 
     - name: Test
-      working-directory: ${{ steps.strings.outputs.build-output-dir }}
-      # Execute tests defined by the CMake configuration. Note that --build-config is needed because the default Windows generator is a multi-config generator (Visual Studio generator).
-      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-      run: ctest --build-config ${{ matrix.build_type }}
+      run: ctest --test-dir build --build-config Release

CMakeLists.txt

@@ -1,20 +1,61 @@
 cmake_minimum_required(VERSION 3.16)
+
 project(warehouse_storage_system LANGUAGES CXX)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 find_package(Threads REQUIRED)
 
-set(MYSQL_DIR "D:/Program Files/MySQL/MySQL Server 8.0")
-
 add_executable(warehouse_server
     src/main.cpp
 )
 
-target_include_directories(warehouse_server PRIVATE "${MYSQL_DIR}/include")
-target_link_libraries(warehouse_server PRIVATE Threads::Threads "${MYSQL_DIR}/lib/libmysql.lib")
+target_link_libraries(warehouse_server PRIVATE Threads::Threads)
+
+# ===============================
+# Windows
+# ===============================
+if(WIN32)
+
+    find_package(unofficial-libmysql CONFIG REQUIRED)
+
+    get_target_property(
+        MYSQL_INCLUDE_DIR
+        unofficial::libmysql::libmysql
+        INTERFACE_INCLUDE_DIRECTORIES
+    )
+
+    target_include_directories(
+        warehouse_server PRIVATE
+        ${MYSQL_INCLUDE_DIR}
+    )
+
+    target_link_libraries(
+        warehouse_server PRIVATE
+        unofficial::libmysql::libmysql
+        ws2_32
+    )
+
+# ===============================
+# Linux
+# ===============================
+else()
+
+    find_package(PkgConfig REQUIRED)
+
+    pkg_check_modules(MYSQL REQUIRED mysqlclient)
+
+    target_include_directories(warehouse_server PRIVATE
+        ${MYSQL_INCLUDE_DIRS}
+    )
+
+    target_link_directories(warehouse_server PRIVATE
+        ${MYSQL_LIBRARY_DIRS}
+    )
+
+    target_link_libraries(warehouse_server PRIVATE
+        ${MYSQL_LIBRARIES}
+    )
 
-if (WIN32)
-    target_link_libraries(warehouse_server PRIVATE ws2_32)
 endif()

src/main.cpp

@@ -13,7 +13,6 @@
 #include <string>
 #include <thread>
 #include <vector>
-#include <mysql.h>
 
 #ifdef _WIN32
 #ifndef NOMINMAX
@@ -32,7 +31,11 @@ using Socket = int;
 #define SOCKET_ERROR (-1)
 #endif
 
+#ifdef _WIN32
 #include <mysql.h>
+#else
+#include <mysql/mysql.h>
+#endif
 
 namespace {
     constexpr int kPort = 8081;