Bug 13878021 - WINDOWS PACKAGE THAT INCLUDES .PDB FILES FOR INTERMEDIATE LIBRARIES USED

9 files changed, 37 insertions, 20 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0de56225155..7f46c671f3f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -465,26 +465,6 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
   INSTALL(FILES README DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
   INSTALL(FILES ${CMAKE_BINARY_DIR}/Docs/INFO_SRC ${CMAKE_BINARY_DIR}/Docs/INFO_BIN DESTINATION ${INSTALL_DOCDIR})
   
-  IF(WIN32)
-     SET(EXTRA_PDB_FILES
-       ${CMAKE_BINARY_DIR}/libmysql/authentication_win/${CMAKE_BUILD_TYPE}/auth_win_client.pdb
-       ${CMAKE_BINARY_DIR}/libmysql/${CMAKE_BUILD_TYPE}/clientlib.pdb
-       ${CMAKE_BINARY_DIR}/strings/${CMAKE_BUILD_TYPE}/strings.pdb
-       ${CMAKE_BINARY_DIR}/mysys/${CMAKE_BUILD_TYPE}/mysys.pdb
-       ${CMAKE_BINARY_DIR}/vio/${CMAKE_BUILD_TYPE}/vio.pdb
-       ${CMAKE_BINARY_DIR}/zlib/${CMAKE_BUILD_TYPE}/zlib.pdb
-       ${CMAKE_BINARY_DIR}/extra/yassl/${CMAKE_BUILD_TYPE}/yassl.pdb
-       ${CMAKE_BINARY_DIR}/extra/yassl/taocrypt/${CMAKE_BUILD_TYPE}/taocrypt.pdb
-     )  
-     INSTALL(FILES ${EXTRA_PDB_FILES} DESTINATION ${INSTALL_LIBDIR} COMPONENT DebugBinaries)
-     FOREACH(f ${EXTRA_PDB_FILES})
-        STRING(REPLACE "RelWithDebInfo" "Debug" df ${f})
-        IF(EXISTS ${df})
-          INSTALL(FILES ${df} DESTINATION ${INSTALL_LIBDIR}/debug COMPONENT DebugBinaries)
-        ENDIF()
-     ENDFOREACH()
-  ENDIF()
-  
   IF(UNIX)
     INSTALL(FILES Docs/INSTALL-BINARY DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
   ENDIF()
diff --git a/extra/yassl/CMakeLists.txt b/extra/yassl/CMakeLists.txt
index b8432f06ac6..94a336c53dc 100644
--- a/extra/yassl/CMakeLists.txt
+++ b/extra/yassl/CMakeLists.txt
@@ -37,4 +37,9 @@ ENDIF()
 ADD_CONVENIENCE_LIBRARY(yassl ${YASSL_SOURCES})
 RESTRICT_SYMBOL_EXPORTS(yassl)
 
+INSTALL_DEBUG_SYMBOLS(yassl)
+IF(MSVC)
+   INSTALL_DEBUG_TARGET(yassl DESTINATION ${INSTALL_LIBDIR}/debug)
+ENDIF()
+
 
diff --git a/extra/yassl/taocrypt/CMakeLists.txt b/extra/yassl/taocrypt/CMakeLists.txt
index 10ed614445e..9f1f2a102da 100644
--- a/extra/yassl/taocrypt/CMakeLists.txt
+++ b/extra/yassl/taocrypt/CMakeLists.txt
@@ -36,3 +36,8 @@ ENDIF()
 ADD_CONVENIENCE_LIBRARY(taocrypt ${TAOCRYPT_SOURCES})
 RESTRICT_SYMBOL_EXPORTS(taocrypt)
 
+INSTALL_DEBUG_SYMBOLS(taocrypt)
+IF(MSVC)
+   INSTALL_DEBUG_TARGET(taocrypt DESTINATION ${INSTALL_LIBDIR}/debug)
+ENDIF()
+
diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
index 1d7a134aefa..83386d8073a 100644
--- a/libmysql/CMakeLists.txt
+++ b/libmysql/CMakeLists.txt
@@ -168,8 +168,10 @@ ENDIF()
 MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development)
 
 # Visual Studio users need debug  static library for debug projects
+INSTALL_DEBUG_SYMBOLS(clientlib)
 IF(MSVC)
  INSTALL_DEBUG_TARGET(mysqlclient DESTINATION ${INSTALL_LIBDIR}/debug)
+ INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug)
 ENDIF()
 
 IF(UNIX)
diff --git a/libmysql/authentication_win/CMakeLists.txt b/libmysql/authentication_win/CMakeLists.txt
index 80cd14780e6..cd790975b34 100644
--- a/libmysql/authentication_win/CMakeLists.txt
+++ b/libmysql/authentication_win/CMakeLists.txt
@@ -31,3 +31,8 @@ TARGET_LINK_LIBRARIES(auth_win_client Secur32)
 # In IDE, group headers in a separate folder.
 
 SOURCE_GROUP(Headers REGULAR_EXPRESSION ".*h$")
+
+INSTALL_DEBUG_SYMBOLS(auth_win_client)
+IF(MSVC)
+   INSTALL_DEBUG_TARGET(auth_win_client DESTINATION ${INSTALL_LIBDIR}/debug)
+ENDIF()
diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt
index 95d3e568be7..648a87d1e95 100644
--- a/mysys/CMakeLists.txt
+++ b/mysys/CMakeLists.txt
@@ -77,3 +77,8 @@ ENDIF()
 ADD_EXECUTABLE(thr_lock thr_lock.c)
 TARGET_LINK_LIBRARIES(thr_lock mysys)
 SET_TARGET_PROPERTIES(thr_lock PROPERTIES COMPILE_FLAGS "-DMAIN")
+
+INSTALL_DEBUG_SYMBOLS(mysys)
+IF(MSVC)
+   INSTALL_DEBUG_TARGET(mysys DESTINATION ${INSTALL_LIBDIR}/debug)
+ENDIF()
diff --git a/strings/CMakeLists.txt b/strings/CMakeLists.txt
index 552bf942700..77b093c4fb1 100644
--- a/strings/CMakeLists.txt
+++ b/strings/CMakeLists.txt
@@ -31,3 +31,8 @@ ENDIF()
 # Avoid dependencies on perschema data defined in mysys
 ADD_DEFINITIONS(-DDISABLE_MYSQL_THREAD_H)
 ADD_CONVENIENCE_LIBRARY(strings ${STRINGS_SOURCES})
+
+INSTALL_DEBUG_SYMBOLS(strings)
+IF(MSVC)
+   INSTALL_DEBUG_TARGET(strings DESTINATION ${INSTALL_LIBDIR}/debug)
+ENDIF()
diff --git a/vio/CMakeLists.txt b/vio/CMakeLists.txt
index e61281a43d8..bf811a0de9b 100644
--- a/vio/CMakeLists.txt
+++ b/vio/CMakeLists.txt
@@ -20,3 +20,8 @@ ADD_DEFINITIONS(${SSL_DEFINES})
 SET(VIO_SOURCES  vio.c viosocket.c viossl.c viosslfactories.c)
 ADD_CONVENIENCE_LIBRARY(vio ${VIO_SOURCES})
 TARGET_LINK_LIBRARIES(vio ${LIBSOCKET})
+
+INSTALL_DEBUG_SYMBOLS(vio)
+IF(MSVC)
+   INSTALL_DEBUG_TARGET(vio DESTINATION ${INSTALL_LIBDIR}/debug)
+ENDIF()
diff --git a/zlib/CMakeLists.txt b/zlib/CMakeLists.txt
index 68799947e44..bcfacea4b0b 100644
--- a/zlib/CMakeLists.txt
+++ b/zlib/CMakeLists.txt
@@ -23,3 +23,8 @@ SET(ZLIB_SOURCES  adler32.c compress.c crc32.c crc32.h deflate.c deflate.h gzio.
 ADD_CONVENIENCE_LIBRARY(zlib ${ZLIB_SOURCES})
 RESTRICT_SYMBOL_EXPORTS(zlib)
 
+INSTALL_DEBUG_SYMBOLS(zlib)
+IF(MSVC)
+   INSTALL_DEBUG_TARGET(zlib DESTINATION ${INSTALL_LIBDIR}/debug)
+ENDIF()
+