Skip to content

Commit faca34d

Browse files
sreedharssreedhars
committed
Bug 13878021 - WINDOWS PACKAGE THAT INCLUDES .PDB FILES FOR INTERMEDIATE LIBRARIES USED
1 parent c684873 commit faca34d

9 files changed

Lines changed: 37 additions & 20 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -465,26 +465,6 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
465465
INSTALL(FILES README DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
466466
INSTALL(FILES ${CMAKE_BINARY_DIR}/Docs/INFO_SRC ${CMAKE_BINARY_DIR}/Docs/INFO_BIN DESTINATION ${INSTALL_DOCDIR})
467467

468-
IF(WIN32)
469-
SET(EXTRA_PDB_FILES
470-
${CMAKE_BINARY_DIR}/libmysql/authentication_win/${CMAKE_BUILD_TYPE}/auth_win_client.pdb
471-
${CMAKE_BINARY_DIR}/libmysql/${CMAKE_BUILD_TYPE}/clientlib.pdb
472-
${CMAKE_BINARY_DIR}/strings/${CMAKE_BUILD_TYPE}/strings.pdb
473-
${CMAKE_BINARY_DIR}/mysys/${CMAKE_BUILD_TYPE}/mysys.pdb
474-
${CMAKE_BINARY_DIR}/vio/${CMAKE_BUILD_TYPE}/vio.pdb
475-
${CMAKE_BINARY_DIR}/zlib/${CMAKE_BUILD_TYPE}/zlib.pdb
476-
${CMAKE_BINARY_DIR}/extra/yassl/${CMAKE_BUILD_TYPE}/yassl.pdb
477-
${CMAKE_BINARY_DIR}/extra/yassl/taocrypt/${CMAKE_BUILD_TYPE}/taocrypt.pdb
478-
)
479-
INSTALL(FILES ${EXTRA_PDB_FILES} DESTINATION ${INSTALL_LIBDIR} COMPONENT DebugBinaries)
480-
FOREACH(f ${EXTRA_PDB_FILES})
481-
STRING(REPLACE "RelWithDebInfo" "Debug" df ${f})
482-
IF(EXISTS ${df})
483-
INSTALL(FILES ${df} DESTINATION ${INSTALL_LIBDIR}/debug COMPONENT DebugBinaries)
484-
ENDIF()
485-
ENDFOREACH()
486-
ENDIF()
487-
488468
IF(UNIX)
489469
INSTALL(FILES Docs/INSTALL-BINARY DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
490470
ENDIF()

‎extra/yassl/CMakeLists.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,9 @@ ENDIF()
3737
ADD_CONVENIENCE_LIBRARY(yassl ${YASSL_SOURCES})
3838
RESTRICT_SYMBOL_EXPORTS(yassl)
3939

40+
INSTALL_DEBUG_SYMBOLS(yassl)
41+
IF(MSVC)
42+
INSTALL_DEBUG_TARGET(yassl DESTINATION ${INSTALL_LIBDIR}/debug)
43+
ENDIF()
44+
4045

‎extra/yassl/taocrypt/CMakeLists.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,8 @@ ENDIF()
3636
ADD_CONVENIENCE_LIBRARY(taocrypt ${TAOCRYPT_SOURCES})
3737
RESTRICT_SYMBOL_EXPORTS(taocrypt)
3838

39+
INSTALL_DEBUG_SYMBOLS(taocrypt)
40+
IF(MSVC)
41+
INSTALL_DEBUG_TARGET(taocrypt DESTINATION ${INSTALL_LIBDIR}/debug)
42+
ENDIF()
43+

‎libmysql/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,10 @@ ENDIF()
168168
MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development)
169169

170170
# Visual Studio users need debug static library for debug projects
171+
INSTALL_DEBUG_SYMBOLS(clientlib)
171172
IF(MSVC)
172173
INSTALL_DEBUG_TARGET(mysqlclient DESTINATION ${INSTALL_LIBDIR}/debug)
174+
INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug)
173175
ENDIF()
174176

175177
IF(UNIX)

‎libmysql/authentication_win/CMakeLists.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,8 @@ TARGET_LINK_LIBRARIES(auth_win_client Secur32)
3131
# In IDE, group headers in a separate folder.
3232

3333
SOURCE_GROUP(Headers REGULAR_EXPRESSION ".*h$")
34+
35+
INSTALL_DEBUG_SYMBOLS(auth_win_client)
36+
IF(MSVC)
37+
INSTALL_DEBUG_TARGET(auth_win_client DESTINATION ${INSTALL_LIBDIR}/debug)
38+
ENDIF()

‎mysys/CMakeLists.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,3 +77,8 @@ ENDIF()
7777
ADD_EXECUTABLE(thr_lock thr_lock.c)
7878
TARGET_LINK_LIBRARIES(thr_lock mysys)
7979
SET_TARGET_PROPERTIES(thr_lock PROPERTIES COMPILE_FLAGS "-DMAIN")
80+
81+
INSTALL_DEBUG_SYMBOLS(mysys)
82+
IF(MSVC)
83+
INSTALL_DEBUG_TARGET(mysys DESTINATION ${INSTALL_LIBDIR}/debug)
84+
ENDIF()

‎strings/CMakeLists.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,8 @@ ENDIF()
3131
# Avoid dependencies on perschema data defined in mysys
3232
ADD_DEFINITIONS(-DDISABLE_MYSQL_THREAD_H)
3333
ADD_CONVENIENCE_LIBRARY(strings ${STRINGS_SOURCES})
34+
35+
INSTALL_DEBUG_SYMBOLS(strings)
36+
IF(MSVC)
37+
INSTALL_DEBUG_TARGET(strings DESTINATION ${INSTALL_LIBDIR}/debug)
38+
ENDIF()

‎vio/CMakeLists.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,8 @@ ADD_DEFINITIONS(${SSL_DEFINES})
2020
SET(VIO_SOURCES vio.c viosocket.c viossl.c viosslfactories.c)
2121
ADD_CONVENIENCE_LIBRARY(vio ${VIO_SOURCES})
2222
TARGET_LINK_LIBRARIES(vio ${LIBSOCKET})
23+
24+
INSTALL_DEBUG_SYMBOLS(vio)
25+
IF(MSVC)
26+
INSTALL_DEBUG_TARGET(vio DESTINATION ${INSTALL_LIBDIR}/debug)
27+
ENDIF()

‎zlib/CMakeLists.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,8 @@ SET(ZLIB_SOURCES adler32.c compress.c crc32.c crc32.h deflate.c deflate.h gzio.
2323
ADD_CONVENIENCE_LIBRARY(zlib ${ZLIB_SOURCES})
2424
RESTRICT_SYMBOL_EXPORTS(zlib)
2525

26+
INSTALL_DEBUG_SYMBOLS(zlib)
27+
IF(MSVC)
28+
INSTALL_DEBUG_TARGET(zlib DESTINATION ${INSTALL_LIBDIR}/debug)
29+
ENDIF()
30+

0 commit comments

Comments
 (0)