45 lines
1.9 KiB
Diff
45 lines
1.9 KiB
Diff
|
--- mysql-5.5.17/cmake/install_macros.cmake 2011-10-12 07:10:24.000000000 -0500
|
||
|
|
+++ mysql-5.5.17/cmake/install_macros.cmake 2011-11-07 23:19:35.772837800 -0600
|
||
|
|
@@ -230,7 +230,13 @@ FUNCTION(MYSQL_INSTALL_TARGETS)
|
||
|
|
IF(ARG_COMPONENT)
|
||
|
|
SET(COMP COMPONENT ${ARG_COMPONENT})
|
||
|
|
ENDIF()
|
||
|
|
- INSTALL(TARGETS ${TARGETS} DESTINATION ${ARG_DESTINATION} ${COMP})
|
||
|
|
+ IF(${ARG_DESTINATION} STREQUAL "${INSTALL_LIBDIR}")
|
||
|
|
+ INSTALL(TARGETS ${TARGETS} LIBRARY DESTINATION ${ARG_DESTINATION}
|
||
|
|
+ RUNTIME DESTINATION bin
|
||
|
|
+ ARCHIVE DESTINATION ${ARG_DESTINATION} ${COMP})
|
||
|
|
+ ELSE()
|
||
|
|
+ INSTALL(TARGETS ${TARGETS} DESTINATION ${ARG_DESTINATION} ${COMP})
|
||
|
|
+ ENDIF()
|
||
|
|
SET(INSTALL_LOCATION ${ARG_DESTINATION} )
|
||
|
|
INSTALL_DEBUG_SYMBOLS("${TARGETS}")
|
||
|
|
SET(INSTALL_LOCATION)
|
||
|
|
--- mysql-5.5.17/libmysql/CMakeLists.txt 2011-10-12 07:10:24.000000000 -0500
|
||
|
|
+++ mysql-5.5.17/libmysql/CMakeLists.txt 2011-11-08 03:19:31.379219300 -0600
|
||
|
|
@@ -214,6 +214,7 @@ IF(NOT DISABLE_SHARED)
|
||
|
|
SET_TARGET_PROPERTIES(mysqlclient PROPERTIES CLEAN_DIRECT_OUTPUT 1)
|
||
|
|
SET_TARGET_PROPERTIES(libmysql PROPERTIES CLEAN_DIRECT_OUTPUT 1)
|
||
|
|
|
||
|
|
+ IF(NOT CYGWIN)
|
||
|
|
# Install links to libmysqlclient.so (client_r)
|
||
|
|
GET_VERSIONED_LIBNAME(
|
||
|
|
"${CMAKE_SHARED_LIBRARY_PREFIX}mysqlclient_r"
|
||
|
|
@@ -231,5 +232,6 @@ IF(NOT DISABLE_SHARED)
|
||
|
|
linkname)
|
||
|
|
INSTALL_SYMLINK(${linkname} libmysql ${INSTALL_LIBDIR} SharedLibraries)
|
||
|
|
ENDFOREACH()
|
||
|
|
+ ENDIF(NOT CYGWIN)
|
||
|
|
ENDIF()
|
||
|
|
ENDIF()
|
||
|
|
--- mysql-5.5.17/strings/dtoa.c 2011-10-12 07:10:25.000000000 -0500
|
||
|
|
+++ mysql-5.5.17/strings/dtoa.c 2011-11-07 20:38:05.064690100 -0600
|
||
|
|
@@ -36,6 +36,7 @@
|
||
|
|
|
||
|
|
***************************************************************/
|
||
|
|
|
||
|
|
+#define __STRICT_ANSI__
|
||
|
|
#include <my_base.h> /* for EOVERFLOW on Windows */
|
||
|
|
#include <my_global.h>
|
||
|
|
#include <m_string.h> /* for memcpy and NOT_FIXED_DEC */
|