Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Build fix #267

Merged
merged 8 commits into from
Feb 28, 2020
Merged

Build fix #267

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7c24730
Bump CMake minimum requited version to 3.13.5
traceon Feb 24, 2020
4ef9685
Use cmake from kitware repo for bionic
traceon Feb 24, 2020
b4fca54
Remove extra package entries
traceon Feb 24, 2020
15b1dd5
allow to disable CMAKE_INTERPROCEDURAL_OPTIMIZATION manually
filimonov Feb 24, 2020
1180cd1
Added note and links to cmake APT repo and compilation instructions
traceon Feb 25, 2020
d1b5e87
Review static runtime linking
traceon Feb 26, 2020
29ac19a
Apply version script to driver's shared lib
traceon Feb 26, 2020
521e5ae
Merge branch 'master' into build-fix
traceon Feb 28, 2020
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
22 changes: 22 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ jobs:
- docker
addons:
apt:
sources:
- sourceline: 'deb https://apt.kitware.com/ubuntu/ bionic main'
key_url: 'https://apt.kitware.com/keys/kitware-archive-latest.asc'
packages:
- gcc
- g++
Expand All @@ -61,6 +64,9 @@ jobs:
- docker
addons:
apt:
sources:
- sourceline: 'deb https://apt.kitware.com/ubuntu/ bionic main'
key_url: 'https://apt.kitware.com/keys/kitware-archive-latest.asc'
packages:
- gcc
- g++
Expand All @@ -86,6 +92,9 @@ jobs:
- docker
addons:
apt:
sources:
- sourceline: 'deb https://apt.kitware.com/ubuntu/ bionic main'
key_url: 'https://apt.kitware.com/keys/kitware-archive-latest.asc'
packages:
- gcc
- g++
Expand All @@ -111,6 +120,9 @@ jobs:
- docker
addons:
apt:
sources:
- sourceline: 'deb https://apt.kitware.com/ubuntu/ bionic main'
key_url: 'https://apt.kitware.com/keys/kitware-archive-latest.asc'
packages:
- gcc
- g++
Expand Down Expand Up @@ -140,6 +152,9 @@ jobs:
- docker
addons:
apt:
sources:
- sourceline: 'deb https://apt.kitware.com/ubuntu/ bionic main'
key_url: 'https://apt.kitware.com/keys/kitware-archive-latest.asc'
packages:
- clang
- unixodbc
Expand All @@ -164,6 +179,9 @@ jobs:
- docker
addons:
apt:
sources:
- sourceline: 'deb https://apt.kitware.com/ubuntu/ bionic main'
key_url: 'https://apt.kitware.com/keys/kitware-archive-latest.asc'
packages:
- gcc
- g++
Expand All @@ -189,6 +207,9 @@ jobs:
- docker
addons:
apt:
sources:
- sourceline: 'deb https://apt.kitware.com/ubuntu/ bionic main'
key_url: 'https://apt.kitware.com/keys/kitware-archive-latest.asc'
packages:
- clang
- iodbc
Expand Down Expand Up @@ -287,6 +308,7 @@ before_install: |-

install: |-
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
export PATH=$(echo "$PATH" | sed -e 's|:/usr/local/cmake-[^:]*/bin:|:|')
sudo apt-get install -y build-essential cmake perl libdbi-perl libdbd-odbc-perl python python-pyodbc
elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
# brew install cmake perl python
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.12)
cmake_minimum_required (VERSION 3.13.5)

set (CMAKE_MODULE_PATH_orig ${CMAKE_MODULE_PATH})
set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ To debug issues with the driver, first things that need to be done are:

The general requirements for building the driver from sources are as follows:

- CMake 3.12 and later
- CMake 3.13.5 and later
- C++17 and C11 capable compiler toolchain:
- Clang 4 and later
- GCC 7 and later
Expand Down
6 changes: 1 addition & 5 deletions cmake/Modules/FindODBC.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,11 +200,7 @@ if (ODBC_PROVIDER AND ODBC_${_provider_uc}_FOUND)
target_compile_definitions (ODBC::${_role} INTERFACE ${ODBC_${_role_uc}_DEFINES})
target_include_directories (ODBC::${_role} INTERFACE ${ODBC_${_role_uc}_INCLUDE_DIRS})
target_compile_options (ODBC::${_role} INTERFACE ${ODBC_${_role_uc}_COMPILER_FLAGS})
if (CMAKE_VERSION VERSION_LESS "3.13.5")
target_link_libraries (ODBC::${_role} INTERFACE ${ODBC_${_role_uc}_LINKER_FLAGS})
else ()
target_link_options (ODBC::${_role} INTERFACE ${ODBC_${_role_uc}_LINKER_FLAGS})
endif ()
target_link_libraries (ODBC::${_role} INTERFACE ${ODBC_${_role_uc}_LINKER_FLAGS})

unset (_role_uc)
endforeach ()
Expand Down