diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 15b21c5..804d79d 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.)
@@ -16,8 +16,11 @@ 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
+    
+    - name: Install odbc
+      run: sudo apt install -y unixodbc-dev
+    
     - uses: actions/checkout@v2
 
     - name: Create Build Environment
diff --git a/src/odbc/CMakeLists.txt b/src/odbc/CMakeLists.txt
index 34a7453..8c17b67 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