From be73859c83c137e0953d9f946dd7536f9bc72aed Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <wlad@mariadb.com>
Date: Thu, 11 Aug 2016 16:34:57 +0000
Subject: [PATCH] server integration

---
 CMakeLists.txt            | 14 +++++++++-----
 cmake/plugins.cmake       |  2 +-
 libmariadb/CMakeLists.txt | 20 +++++++++++++++++++-
 plugins/CMakeLists.txt    |  3 +++
 4 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 132c4d83..53023976 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,10 +52,12 @@ IF(WITH_RTC)
   SET(RTC_OPTIONS "/RTC1 /RTCc")
 ENDIF()
 
+IF(NOT FOR_SERVER)
 INCLUDE(FindCURL)
 IF(CURL_FOUND)
   ADD_DEFINITIONS(-DHAVE_CURL=1)
 ENDIF()
+ENDIF(NOT FOR_SERVER)
 
 IF(NOT WIN32)
   INCLUDE(${PROJECT_SOURCE_DIR}/cmake/FindGSSAPI.cmake)
@@ -89,10 +91,11 @@ IF(MSVC)
           IF (CMAKE_BUILD_TYPE STREQUAL "Debug")
             SET(COMPILER_FLAGS "${COMPILER_FLAGS} ${RTC_OPTIONS}")
             STRING(REPLACE "/Zi" "/ZI" COMPILER_FLAGS ${COMPILER_FLAGS})
+          ELSE()
+            STRING(REPLACE "/Zi" "/Z7" COMPILER_FLAGS ${COMPILER_FLAGS})
           ENDIF()
           MESSAGE (STATUS "CMAKE_${COMPILER}_FLAGS_${BUILD_TYPE}= ${COMPILER_FLAGS}") 
-          SET(CMAKE_${COMPILER}_FLAGS_${BUILD_TYPE} ${COMPILER_FLAGS} CACHE 
-               STRING "overwritten by libmariadb" FORCE)
+          SET(CMAKE_${COMPILER}_FLAGS_${BUILD_TYPE} ${COMPILER_FLAGS})
         ENDIF()
       ENDFOREACH()
     ENDFOREACH()
@@ -141,9 +144,10 @@ SET(DEFAULT_CHARSET_HOME "${CMAKE_INSTALL_PREFIX}")
 INCLUDE(${PROJECT_SOURCE_DIR}/cmake/SearchLibrary.cmake)
 
 IF(WITH_EXTERNAL_ZLIB)
-  FIND_PACKAGE(ZLIB QUIET)
-  IF(${ZLIB_FOUND})
-    SET(LIBZ "-z")
+  FIND_PACKAGE(ZLIB)
+  IF(ZLIB_FOUND)
+    INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
+    SET(LIBZ ${ZLIB_LIBRARY})
   ENDIF()
 ENDIF()
 
diff --git a/cmake/plugins.cmake b/cmake/plugins.cmake
index 03225c42..afe25b63 100644
--- a/cmake/plugins.cmake
+++ b/cmake/plugins.cmake
@@ -34,7 +34,7 @@ MARK_AS_ADVANCED(PLUGINS)
 REGISTER_PLUGIN("SOCKET" "${PROJECT_SOURCE_DIR}/plugins/pvio/pvio_socket.c" "pvio_socket_plugin" "STATIC" pvio_socket 0)
 IF(WIN32)
   REGISTER_PLUGIN("NPIPE" "${PROJECT_SOURCE_DIR}/plugins/pvio/pvio_npipe.c" "pvio_npipe_plugin" "STATIC" pvio_npipe 1)
-  REGISTER_PLUGIN("SHMEM" "${PROJECT_SOURCE_DIR}/plugins/pvio/pvio_shmem.c" "pvio_shmem_plugin" "DYNAMIC" pvio_shmem 1)
+  REGISTER_PLUGIN("SHMEM" "${PROJECT_SOURCE_DIR}/plugins/pvio/pvio_shmem.c" "pvio_shmem_plugin" "STATIC" pvio_shmem 1)
 ENDIF()
 
 # AUTHENTICATION
diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt
index 916e1225..b0f44434 100644
--- a/libmariadb/CMakeLists.txt
+++ b/libmariadb/CMakeLists.txt
@@ -359,6 +359,15 @@ ADD_LIBRARY(mariadbclient STATIC ${mariadbclient_RC} ${MARIADB_OBJECTS} ${EMPTY_
 TARGET_LINK_LIBRARIES(mariadbclient ${SYSTEM_LIBS})
 ADD_LIBRARY(libmariadb SHARED ${libmariadb_RC} ${MARIADB_OBJECTS} ${EMPTY_FILE} mariadbclient.def)
 TARGET_LINK_LIBRARIES(libmariadb ${SYSTEM_LIBS})
+IF(FOR_SERVER)
+  SET_TARGET_PROPERTIES(mariadbclient PROPERTIES OUTPUT_NAME mysqlclient)
+  IF(WIN32)
+    SET_TARGET_PROPERTIES(libmariadb PROPERTIES OUTPUT_NAME libmysql)
+  ELSE()
+    SET_TARGET_PROPERTIES(libmariadb PROPERTIES OUTPUT_NAME mysqlclient)
+  ENDIF()
+ENDIF()
+
 IF(UNIX)
   SET_TARGET_PROPERTIES(libmariadb PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}")
 ENDIF()
@@ -408,4 +417,13 @@ INSTALL(TARGETS
           LIBRARY DESTINATION "${LIB_INSTALL_DIR}/${SUFFIX_INSTALL_DIR}"
           ARCHIVE DESTINATION "${LIB_INSTALL_DIR}/${SUFFIX_INSTALL_DIR}")
 
-
+IF(WIN32)
+   # On Windows, install PDB
+   GET_TARGET_PROPERTY(location libmariadb LOCATION)
+   STRING(REPLACE ".dll" ".pdb" pdb_location ${location})
+   IF (NOT "${CMAKE_CFG_INTDIR}" STREQUAL "")
+     STRING(REPLACE "${CMAKE_CFG_INTDIR}" "\${CMAKE_INSTALL_CONFIG_NAME}"
+      pdb_location ${pdb_location})
+   ENDIF()
+   INSTALL(FILES ${pdb_location} DESTINATION "${LIB_INSTALL_DIR}/${SUFFIX_INSTALL_DIR}")
+ENDIF()
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index aa6efbd4..2ce1a940 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -1,3 +1,6 @@
+IF(FOR_SERVER)
+  RETURN()
+ENDIF()
 FILE(GLOB plugin_dirs ${PROJECT_SOURCE_DIR}/plugins/*)
 FOREACH(dir ${plugin_dirs})
   IF (EXISTS ${dir}/CMakeLists.txt)