MonetDB: Oct2020 - The cmake variable is ODBC_INCLUDE_DIRS, not ...

[Sjoerd Mullender]

Changeset: f055b8ebc3f2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f055b8ebc3f2
Modified Files:
        clients/odbc/driver/CMakeLists.txt
        clients/odbc/samples/CMakeLists.txt
        clients/odbc/setup/CMakeLists.txt
        cmake/monetdb-defines.cmake
Branch: Oct2020
Log Message:

The cmake variable is ODBC_INCLUDE_DIRS, not ODBC_INCLUDE_DIR.


diffs (48 lines):

diff --git a/clients/odbc/driver/CMakeLists.txt 
b/clients/odbc/driver/CMakeLists.txt
--- a/clients/odbc/driver/CMakeLists.txt
+++ b/clients/odbc/driver/CMakeLists.txt
@@ -107,7 +107,7 @@ target_sources(MonetODBC
 
 target_include_directories(MonetODBC
   PRIVATE
-  $<$<BOOL:${ODBC_FOUND}>:${ODBC_INCLUDE_DIR}>
+  $<$<BOOL:${ODBC_FOUND}>:${ODBC_INCLUDE_DIRS}>
   PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb>)
diff --git a/clients/odbc/samples/CMakeLists.txt 
b/clients/odbc/samples/CMakeLists.txt
--- a/clients/odbc/samples/CMakeLists.txt
+++ b/clients/odbc/samples/CMakeLists.txt
@@ -6,7 +6,7 @@
 # Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
 #]]
 
-include_directories($<$<BOOL:${ODBC_FOUND}>:${ODBC_INCLUDE_DIR}>)
+include_directories($<$<BOOL:${ODBC_FOUND}>:${ODBC_INCLUDE_DIRS}>)
 
 if(TESTING)
   add_executable(odbcsample1
diff --git a/clients/odbc/setup/CMakeLists.txt 
b/clients/odbc/setup/CMakeLists.txt
--- a/clients/odbc/setup/CMakeLists.txt
+++ b/clients/odbc/setup/CMakeLists.txt
@@ -16,7 +16,7 @@ target_sources(MonetODBCs
 
 target_include_directories(MonetODBCs
   PRIVATE
-  $<$<BOOL:${ODBC_FOUND}>:${ODBC_INCLUDE_DIR}>
+  $<$<BOOL:${ODBC_FOUND}>:${ODBC_INCLUDE_DIRS}>
   PUBLIC
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb>)
diff --git a/cmake/monetdb-defines.cmake b/cmake/monetdb-defines.cmake
--- a/cmake/monetdb-defines.cmake
+++ b/cmake/monetdb-defines.cmake
@@ -324,7 +324,7 @@ macro(monetdb_configure_sizes)
 
   if(ODBC_FOUND)
     cmake_push_check_state()
-    set(CMAKE_REQUIRED_INCLUDES 
"${CMAKE_REQUIRED_INCLUDES};${ODBC_INCLUDE_DIR}")
+    set(CMAKE_REQUIRED_INCLUDES 
"${CMAKE_REQUIRED_INCLUDES};${ODBC_INCLUDE_DIRS}")
     if(WIN32)
       set(CMAKE_EXTRA_INCLUDE_FILES 
"${CMAKE_EXTRA_INCLUDE_FILES};Windows.h;sqlext.h;sqltypes.h")
       check_include_file("afxres.h" HAVE_AFXRES_H)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list