From 939bfb039f9d0b204c51a370dac494c3f0ab2053 Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Thu, 24 Jan 2013 00:08:02 +0400 Subject: [PATCH 1/3] Adding /EHsc flags when compiling on windows. Required for mycat.cc modified: storage/connect/CMakeLists.txt --- storage/connect/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/storage/connect/CMakeLists.txt b/storage/connect/CMakeLists.txt index 2593c612be3..e34661f3b14 100644 --- a/storage/connect/CMakeLists.txt +++ b/storage/connect/CMakeLists.txt @@ -54,6 +54,7 @@ SET(CONNECT_SOURCES ${CONNECT_SOURCES} inihandl.c) ELSE(!UNIX) # Windows (manually add exception handling to the CONNECT project) SET(CONNECT_SOURCES ${CONNECT_SOURCES} tabwmi.cpp tabmac.cpp macutil.cpp) +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc") ENDIF(UNIX) From 19d98a331d92ebda3fbc1a0c71a176f57c36cf94 Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Thu, 24 Jan 2013 01:43:37 +0400 Subject: [PATCH 2/3] Adding iphlpapi.lib library on Windows. Needed for Mac utils. --- storage/connect/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/storage/connect/CMakeLists.txt b/storage/connect/CMakeLists.txt index e34661f3b14..b7ac3761586 100644 --- a/storage/connect/CMakeLists.txt +++ b/storage/connect/CMakeLists.txt @@ -51,10 +51,12 @@ add_definitions( -DUNIX -DLINUX -DUBUNTU ) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -fexceptions -fPIC ") get_property(inc_dirs DIRECTORY PROPERTY INCLUDE_DIRECTORIES) SET(CONNECT_SOURCES ${CONNECT_SOURCES} inihandl.c) +SET(IPHLPAPI_LIBRARY "") ELSE(!UNIX) # Windows (manually add exception handling to the CONNECT project) SET(CONNECT_SOURCES ${CONNECT_SOURCES} tabwmi.cpp tabmac.cpp macutil.cpp) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc") +SET(IPHLPAPI_LIBRARY iphlpapi.lib) ENDIF(UNIX) From 6242f1bffa30764284876dfa181310ac00a181d9 Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Thu, 24 Jan 2013 01:48:00 +0400 Subject: [PATCH 3/3] Additional change for iphlpapi.lib. Forgot to add this chunk in the previous commit. --- storage/connect/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storage/connect/CMakeLists.txt b/storage/connect/CMakeLists.txt index b7ac3761586..68fde9f3f1e 100644 --- a/storage/connect/CMakeLists.txt +++ b/storage/connect/CMakeLists.txt @@ -179,4 +179,4 @@ MYSQL_ADD_PLUGIN(connect ${CONNECT_SOURCES} STORAGE_ENGINE MODULE_ONLY MODULE_OUTPUT_NAME "ha_connect" LINK_LIBRARIES ${ZLIB_LIBRARY} ${XML_LIBRARY} ${ICONV_LIBRARY} - ${MYSQL_LIBRARY} ${ODBC_LIBRARY}) + ${MYSQL_LIBRARY} ${ODBC_LIBRARY} ${IPHLPAPI_LIBRARY})