Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
@@ -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.)
Expand All @@ -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
Expand Down
11 changes: 11 additions & 0 deletions src/odbc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down