Changeset: ff650d91a94c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ff650d91a94c
Modified Files:
clients/odbc/driver/CMakeLists.txt
Branch: Oct2020
Log Message:
add ugly hack to make sure we find (our) mapi.h before the windows one.
diffs (21 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,6 +107,7 @@ target_sources(MonetODBC
target_include_directories(MonetODBC
PRIVATE
+ $<TARGET_PROPERTY:mapi,INTERFACE_INCLUDE_DIRECTORIES>
$<$<BOOL:${ODBC_FOUND}>:${ODBC_INCLUDE_DIRS}>
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
@@ -120,8 +121,7 @@ target_link_libraries(MonetODBC
PRIVATE
monetdb_config_header
mutils
- mapi
- ODBC::ODBC)
+ mapi)
install(TARGETS
MonetODBC
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
