Changeset: 4da3ed82666f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4da3ed82666f
Modified Files:
CMakeLists.txt
Branch: cmake-fun
Log Message:
Add ODBC_INCLUDE_DIR before all the tests.
diffs (23 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -873,6 +873,9 @@ if(NOT ${WITH_ODBC} STREQUAL "NO")
message(STATUS "ODBC libraries missing")
endif()
else()
+ cmake_push_check_state()
+ set(CMAKE_REQUIRED_INCLUDES
"${CMAKE_REQUIRED_INCLUDES};${ODBC_INCLUDE_DIR}")
+
find_library(ODBCINST_LIBRARY odbcinst)
if(ODBCINST_LIBRARY)
cmake_push_check_state()
@@ -926,8 +929,7 @@ if(NOT ${WITH_ODBC} STREQUAL "NO")
set(LENP_OR_POINTER_T "SQLPOINTER")
endif()
- cmake_push_check_state()
- set(CMAKE_EXTRA_INCLUDE_FILES
"${CMAKE_EXTRA_INCLUDE_FILES};sql.h")
+ set(CMAKE_EXTRA_INCLUDE_FILES
"${CMAKE_EXTRA_INCLUDE_FILES};sqltypes.h")
check_type_size(SQLWCHAR SIZEOF_SQLWCHAR LANGUAGE C)
cmake_pop_check_state()
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
