From 2da19853d511a9877557d291c0590306f5055bd1 Mon Sep 17 00:00:00 2001 From: Florian Schimmel Date: Mon, 9 Feb 2026 16:03:25 +0100 Subject: [PATCH 1/4] Add includes explicitly for compilation on MacOS --- src/odbc/CMakeLists.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/odbc/CMakeLists.txt b/src/odbc/CMakeLists.txt index 34a7453..f92ac0b 100644 --- a/src/odbc/CMakeLists.txt +++ b/src/odbc/CMakeLists.txt @@ -56,6 +56,12 @@ TARGET_COMPILE_DEFINITIONS(odbccpp_static PUBLIC ODBC_STATIC ) + +target_include_directories(odbccpp_static + PUBLIC + ${ODBC_INCLUDE_DIR} +) + SET_PROPERTY(TARGET odbccpp_static PROPERTY POSITION_INDEPENDENT_CODE ON) # Shared library @@ -73,6 +79,11 @@ TARGET_LINK_LIBRARIES(odbccpp ${ODBC_LIBRARIES} ) +target_include_directories(odbccpp + PUBLIC + ${ODBC_INCLUDE_DIR} +) + SET_PROPERTY(TARGET odbccpp PROPERTY public_headers ${public_headers}) # Installation From c56ff8587a30ade541b140949864bb199a125d81 Mon Sep 17 00:00:00 2001 From: Florian Schimmel Date: Tue, 10 Feb 2026 09:05:48 +0100 Subject: [PATCH 2/4] Add manual running option to github workflow --- .github/workflows/cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 15b21c5..79c586b 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -1,6 +1,6 @@ name: CMake -on: [push, pull_request] +on: [push, pull_request, workflow_dispatch] env: # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) From e26354206dc382351376228f7fb942471699c7de Mon Sep 17 00:00:00 2001 From: Florian Schimmel Date: Tue, 10 Feb 2026 10:57:50 +0100 Subject: [PATCH 3/4] Adapt new version of googletest --- .github/workflows/cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 79c586b..8630eb2 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -16,7 +16,7 @@ jobs: steps: - name: Install gtest - run: cd ~ && git clone https://github.com/google/googletest.git && cd googletest && git checkout -b release-1.10.0 tags/release-1.10.0 && mkdir build && cd build && cmake .. && make && sudo make install + run: cd ~ && git clone https://github.com/google/googletest.git && cd googletest && git checkout -b v1.17.0 tags/v1.17.0 && mkdir build && cd build && cmake .. && make && sudo make install - uses: actions/checkout@v2 From b6cf8dbb1a2e5af901420619bf7f1d81215d57c2 Mon Sep 17 00:00:00 2001 From: Florian Schimmel Date: Wed, 11 Feb 2026 11:35:10 +0100 Subject: [PATCH 4/4] Add unixodbc installation to workflow --- .github/workflows/cmake.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 8630eb2..804d79d 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -17,7 +17,10 @@ jobs: steps: - name: Install gtest run: cd ~ && git clone https://github.com/google/googletest.git && cd googletest && git checkout -b v1.17.0 tags/v1.17.0 && mkdir build && cd build && cmake .. && make && sudo make install - + + - name: Install odbc + run: sudo apt install -y unixodbc-dev + - uses: actions/checkout@v2 - name: Create Build Environment