Skip to content

Commit 924958f

Browse files
sreedharssreedhars
committed
upmerge for bug 13878021
2 parents 3701c5a + faca34d commit 924958f

10 files changed

Lines changed: 41 additions & 27 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -542,31 +542,6 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
542542
)
543543
INSTALL(FILES README DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
544544
INSTALL(FILES ${CMAKE_BINARY_DIR}/Docs/INFO_SRC ${CMAKE_BINARY_DIR}/Docs/INFO_BIN DESTINATION ${INSTALL_DOCDIR})
545-
546-
IF(WIN32)
547-
SET(EXTRA_PDB_FILES
548-
${CMAKE_BINARY_DIR}/libmysql/authentication_win/${CMAKE_BUILD_TYPE}/auth_win_client.pdb
549-
${CMAKE_BINARY_DIR}/libmysql/${CMAKE_BUILD_TYPE}/clientlib.pdb
550-
${CMAKE_BINARY_DIR}/strings/${CMAKE_BUILD_TYPE}/strings.pdb
551-
${CMAKE_BINARY_DIR}/mysys/${CMAKE_BUILD_TYPE}/mysys.pdb
552-
${CMAKE_BINARY_DIR}/mysys_ssl/${CMAKE_BUILD_TYPE}/mysys_ssl.pdb
553-
${CMAKE_BINARY_DIR}/vio/${CMAKE_BUILD_TYPE}/vio.pdb
554-
${CMAKE_BINARY_DIR}/zlib/${CMAKE_BUILD_TYPE}/zlib.pdb
555-
${CMAKE_BINARY_DIR}/extra/yassl/${CMAKE_BUILD_TYPE}/yassl.pdb
556-
${CMAKE_BINARY_DIR}/extra/yassl/taocrypt/${CMAKE_BUILD_TYPE}/taocrypt.pdb
557-
)
558-
#INSTALL(FILES ${EXTRA_PDB_FILES} DESTINATION ${INSTALL_LIBDIR} COMPONENT DebugBinaries)
559-
FOREACH(f ${EXTRA_PDB_FILES})
560-
IF(EXISTS ${f})
561-
INSTALL(FILES ${f} DESTINATION ${INSTALL_LIBDIR} COMPONENT DebugBinaries)
562-
ENDIF()
563-
STRING(REPLACE "RelWithDebInfo" "Debug" df ${f})
564-
IF(EXISTS ${df})
565-
INSTALL(FILES ${df} DESTINATION ${INSTALL_LIBDIR}/debug COMPONENT DebugBinaries)
566-
ENDIF()
567-
ENDFOREACH()
568-
ENDIF()
569-
570545
IF(UNIX)
571546
INSTALL(FILES Docs/INSTALL-BINARY DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
572547
ENDIF()

‎extra/yassl/CMakeLists.txt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,7 @@ SET(YASSL_SOURCES src/buffer.cpp src/cert_wrapper.cpp src/crypto_wrapper.cpp sr
3333
ADD_CONVENIENCE_LIBRARY(yassl ${YASSL_SOURCES})
3434
RESTRICT_SYMBOL_EXPORTS(yassl)
3535

36-
36+
INSTALL_DEBUG_SYMBOLS(yassl)
37+
IF(MSVC)
38+
INSTALL_DEBUG_TARGET(yassl DESTINATION ${INSTALL_LIBDIR}/debug)
39+
ENDIF()

‎extra/yassl/taocrypt/CMakeLists.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,7 @@ 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()

‎libmysql/CMakeLists.txt‎

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

185185
# Visual Studio users need debug static library for debug projects
186+
INSTALL_DEBUG_SYMBOLS(clientlib)
186187
IF(MSVC)
187188
INSTALL_DEBUG_TARGET(mysqlclient DESTINATION ${INSTALL_LIBDIR}/debug)
189+
INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug)
188190
ENDIF()
189191

190192
MACRO(GET_TARGET_NAME target out_name)

‎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: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,13 @@ ENDIF()
7272
ADD_EXECUTABLE(thr_lock thr_lock.c)
7373
TARGET_LINK_LIBRARIES(thr_lock mysys)
7474
SET_TARGET_PROPERTIES(thr_lock PROPERTIES COMPILE_FLAGS "-DMAIN")
75-
7675
ADD_EXECUTABLE(queues queues.c)
7776
TARGET_LINK_LIBRARIES(queues mysys)
7877
SET_TARGET_PROPERTIES(queues PROPERTIES COMPILE_FLAGS "-DMAIN")
7978
ADD_TEST(queues_test queues)
79+
80+
INSTALL_DEBUG_SYMBOLS(mysys)
81+
IF(MSVC)
82+
INSTALL_DEBUG_TARGET(mysys DESTINATION ${INSTALL_LIBDIR}/debug)
83+
ENDIF()
84+

‎mysys_ssl/CMakeLists.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,9 @@ SET(MYSYS_SSL_SOURCES
4949
ADD_CONVENIENCE_LIBRARY(mysys_ssl ${MYSYS_SSL_SOURCES})
5050
TARGET_LINK_LIBRARIES(mysys_ssl dbug strings ${SSL_LIBRARIES} ${ZLIB_LIBRARY})
5151
DTRACE_INSTRUMENT(mysys_ssl)
52+
53+
INSTALL_DEBUG_SYMBOLS(mysys_ssl)
54+
IF(MSVC)
55+
INSTALL_DEBUG_TARGET(mysys_ssl DESTINATION ${INSTALL_LIBDIR}/debug)
56+
ENDIF()
57+

‎strings/CMakeLists.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,8 @@ ADD_CONVENIENCE_LIBRARY(strings ${STRINGS_SOURCES})
3434

3535
ADD_EXECUTABLE(conf_to_src EXCLUDE_FROM_ALL conf_to_src.c)
3636
TARGET_LINK_LIBRARIES(conf_to_src strings)
37+
38+
INSTALL_DEBUG_SYMBOLS(strings)
39+
IF(MSVC)
40+
INSTALL_DEBUG_TARGET(strings DESTINATION ${INSTALL_LIBDIR}/debug)
41+
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 viopipe.c vioshm.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: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,7 @@ 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()

0 commit comments

Comments
 (0)