diff options
| author | Brad King <brad.king@kitware.com> | 2018-11-12 13:19:19 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-11-12 13:19:32 (GMT) |
| commit | a16b24c9ce2bde6503d7580d40e0eab38d279788 (patch) | |
| tree | 7335e32f0c44d3c53ee6d51d42408ef0b51e9742 /Modules | |
| parent | a63a9363b27aa84d01341484f02897814204c922 (diff) | |
| parent | 4e4551f9f37ab95d70d9226103deb673e8f5cd02 (diff) | |
| download | CMake-a16b24c9ce2bde6503d7580d40e0eab38d279788.zip CMake-a16b24c9ce2bde6503d7580d40e0eab38d279788.tar.gz CMake-a16b24c9ce2bde6503d7580d40e0eab38d279788.tar.bz2 | |
Merge topic 'FindODBC-mingw-avoid-hardcoded-odbc32'
4e4551f9f3 FindODBC: Do not assume odbc32.lib for MinGW
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2585
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindODBC.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/FindODBC.cmake b/Modules/FindODBC.cmake index c8ca477..29d7af9 100644 --- a/Modules/FindODBC.cmake +++ b/Modules/FindODBC.cmake @@ -90,7 +90,9 @@ set(_odbc_required_libs_names) ### Try Windows Kits ########################################################## if(WIN32) # List names of ODBC libraries on Windows - set(ODBC_LIBRARY odbc32.lib) + if(NOT MINGW) + set(ODBC_LIBRARY odbc32.lib) + endif() set(_odbc_lib_names odbc32;) # List additional libraries required to use ODBC library |