MonetDB: default - cleanup odbc package detection

[Arjen de Rijke]

Changeset: dbee97e2af88 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dbee97e2af88
Modified Files:
        cmake/monetdb-defines.cmake
        cmake/monetdb-findpackages.cmake
        cmake/monetdb-functions.cmake
Branch: default
Log Message:

cleanup odbc package detection


diffs (69 lines):

diff --git a/cmake/monetdb-defines.cmake b/cmake/monetdb-defines.cmake
--- a/cmake/monetdb-defines.cmake
+++ b/cmake/monetdb-defines.cmake
@@ -312,6 +312,25 @@ macro(monetdb_configure_sizes)
     endif()
     cmake_pop_check_state()
   endif()
+
+  if(ODBC_FOUND)
+    cmake_push_check_state()
+    set(CMAKE_REQUIRED_INCLUDES 
"${CMAKE_REQUIRED_INCLUDES};${ODBC_INCLUDE_DIR}")
+    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)
+    else()
+      set(CMAKE_EXTRA_INCLUDE_FILES 
"${CMAKE_EXTRA_INCLUDE_FILES};sql.h;sqltypes.h")
+    endif()
+    check_type_size(SQLLEN _SQLLEN LANGUAGE C)
+    if(HAVE__SQLLEN)
+      set(LENP_OR_POINTER_T "SQLLEN *")
+    else()
+      set(LENP_OR_POINTER_T "SQLPOINTER")
+    endif()
+    check_type_size(SQLWCHAR SIZEOF_SQLWCHAR LANGUAGE C)
+    cmake_pop_check_state()
+  endif()
 endmacro()
 
 macro(monetdb_configure_misc)
diff --git a/cmake/monetdb-findpackages.cmake b/cmake/monetdb-findpackages.cmake
--- a/cmake/monetdb-findpackages.cmake
+++ b/cmake/monetdb-findpackages.cmake
@@ -105,25 +105,6 @@ endif()
 
 if(ODBC)
   find_package(ODBC)
-  set(HAVE_ODBC "${ODBC_FOUND}")
-  if(ODBC_FOUND)
-    cmake_push_check_state()
-    set(CMAKE_REQUIRED_INCLUDES 
"${CMAKE_REQUIRED_INCLUDES};${ODBC_INCLUDE_DIR}")
-    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)
-    else()
-      set(CMAKE_EXTRA_INCLUDE_FILES 
"${CMAKE_EXTRA_INCLUDE_FILES};sql.h;sqltypes.h")
-    endif()
-    check_type_size(SQLLEN _SQLLEN LANGUAGE C)
-    if(HAVE__SQLLEN)
-      set(LENP_OR_POINTER_T "SQLLEN *")
-    else()
-      set(LENP_OR_POINTER_T "SQLPOINTER")
-    endif()
-    check_type_size(SQLWCHAR SIZEOF_SQLWCHAR LANGUAGE C)
-    cmake_pop_check_state()
-  endif()
 endif()
 
 if(RINTEGRATION)
diff --git a/cmake/monetdb-functions.cmake b/cmake/monetdb-functions.cmake
--- a/cmake/monetdb-functions.cmake
+++ b/cmake/monetdb-functions.cmake
@@ -143,6 +143,7 @@ function(monetdb_cmake_summary)
   message(STATUS "Netcdf library: ${NETCDF_FOUND}")
   message(STATUS "Readline library: ${READLINE_FOUND}")
   message(STATUS "R library: ${LIBR_FOUND}")
+  message(STATUS "ODBC: ${ODBC_FOUND}")
   message(STATUS "Sphinx: ${SPHINX_FOUND}")
   message(STATUS "Createrepo: ${CREATEREPO_FOUND}")
   message(STATUS "-----------------------------------------")
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list