cmake: use of imported ODBC target (#5312)

Run CI with ODBC.

Author: nilason

.github/workflows/cmake.yml

@@ -44,7 +44,7 @@ jobs:
             - name: Install dependencies
               run: |
                 sudo apt-get update -y
-                sudo apt-get install -y wget git gawk findutils ninja-build libpq-dev
+                sudo apt-get install -y wget git gawk findutils ninja-build libpq-dev unixodbc-dev
                 xargs -a <(awk '! /^ *(#|$)/' ".github/workflows/apt.txt") -r -- \
                     sudo apt-get install -y --no-install-recommends --no-install-suggests
             - name: Print build environment variables
@@ -60,7 +60,7 @@ jobs:
               run: |
                 cmake ${CMAKE_OPTIONS} -S $GITHUB_WORKSPACE -B $GITHUB_WORKSPACE/build -G Ninja \
                   -DCMAKE_INSTALL_PREFIX=$HOME/install -DWITH_NLS=OFF -DWITH_GUI=OFF -DWITH_DOCS=OFF \
-                  -DWITH_READLINE=ON
+                  -DWITH_READLINE=ON -DWITH_ODBC=ON
             - name: Print CMakeCache.txt
               shell: bash -el {0}
               run: |

CMakeLists.txt

@@ -101,9 +101,7 @@ option(WITH_LIBPNG "Build with libpng support ." ON)
 option(WITH_SQLITE "Build with SQLite support" ON)
 option(WITH_POSTGRES "Build with Postgres support" ON)
 option(WITH_MYSQL "Build with MySQL support" OFF)
-if(WIN32)
-  option(WITH_ODBC "Build with ODBC support" OFF)
-endif()
+option(WITH_ODBC "Build with ODBC support" OFF)
 option(WITH_ZSTD "Build with zstd support" ON)
 option(WITH_BZLIB "Build with bzlib support" OFF)
 

cmake/modules/CheckDependentLibraries.cmake

@@ -127,15 +127,8 @@ if(WITH_MYSQL)
   endif()
 endif()
 
-if(WITH_ODBC AND WIN32)
-  find_package(ODBC QUIET)
-  if(ODBC_FOUND)
-    add_library(ODBC INTERFACE IMPORTED GLOBAL)
-    #[[
-    set_property(TARGET ODBC PROPERTY INTERFACE_LINK_LIBRARIES ${ODBC_LIBRARIES})
-    set_property(TARGET PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${ODBC_INCLUDE_DIRS})
-    #]]
-  endif()
+if(WITH_ODBC)
+  find_package(ODBC REQUIRED)
 endif()
 
 if(WITH_ZSTD)
@@ -326,7 +319,7 @@ check_target(SQLite::SQLite3 HAVE_SQLITE3_H)
 check_target(PostgreSQL::PostgreSQL HAVE_POSTGRES)
 check_target(PostgreSQL::PostgreSQL HAVE_LIBPQ_FE_H)
 check_target(MYSQL HAVE_MYSQL_H)
-check_target(ODBC HAVE_SQL_H)
+check_target(ODBC::ODBC HAVE_SQL_H)
 check_target(ZSTD HAVE_ZSTD_H)
 check_target(BZIP2 HAVE_BZLIB_H)
 check_target(Readline::Readline HAVE_READLINE_READLINE_H)

db/drivers/CMakeLists.txt

@@ -80,12 +80,13 @@ build_program_in_subdir(
   DEPENDS
   grass_gis
   grass_dbstubs
+  grass_dbmibase
   grass_dbmidriver
   grass_sqlp
   DEFS
   "${grass_dbstubs_DEFS}"
   PRIMARY_DEPENDS
-  ODBC
+  ODBC::ODBC
   HTML_FILE_NAME
   grass-odbc
   RUNTIME_OUTPUT_DIR

include/config.h.cmake.in

@@ -138,7 +138,7 @@
 #cmakedefine HAVE_NICE ${HAVE_NICE}
 
 /* Define to 1 if OGR is to be used. */
-#cmakedefine HAVE_OGR {HAVE_OGR}
+#cmakedefine HAVE_OGR ${HAVE_OGR}
 
 /* Define to 1 if you have the <omp.h> header file. */
 #cmakedefine HAVE_OMP_H ${HAVE_OMP_H}