1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-23 08:45:18 +03:00
Commit Graph

30 Commits

Author SHA1 Message Date
3e96ec0ef9 Backport from trunk:
Bug#18187290 ISSUE WITH BUILDING MYSQL USING CMAKE 2.8.12

We want to upgrade to VS2013 on Windows.
In order to do this, we need to upgrade to cmake 2.8.12
This has introduced some incompatibilities for .pdb files,
and "make install" no longer works.

To reproduce:
  cmake --build . --target package --config debug

The fix:
Rather than installing .pdb files for static libraries, we use the /Z7 flag
to store symbolic debugging information in the .obj files.
2014-05-07 17:09:14 +02:00
2bdffb1de4 Backport of Bug#16809055 MYSQL 5.6 AND 5.7 STILL USE LIBMYSQLCLIENT.SO.18
Backported only the softlink part of the patch,
*not* the bumping of library version.

With this patch, the libmysql/ directory contains:
libmysqlclient.a
libmysqlclient_r.a -> libmysqlclient.a
libmysqlclient_r.so -> libmysqlclient.so*
libmysqlclient_r.so.18 -> libmysqlclient.so.18*
libmysqlclient_r.so.18.0.0 -> libmysqlclient.so.18.0.0*
libmysqlclient.so -> libmysqlclient.so.18*
libmysqlclient.so.18 -> libmysqlclient.so.18.0.0*
libmysqlclient.so.18.0.0*
2014-01-23 09:02:47 +01:00
5734bae576 Updated/added copyright headers 2012-02-16 10:48:16 +01:00
6370e1ccd1 Bug#13463417 63487: ANNOYING TRACE MESSAGE IN CMAKE CODE
Remove it.
2011-12-15 10:44:33 +01:00
9da00ebec9 Updated/added copyright headers 2011-06-30 17:46:53 +02:00
a6b4be2522 add missing COMPONENT to all CMake INSTALL commands 2010-11-13 23:16:52 +01:00
9c70014e65 Bug#58074: ADD_VERSION_INFO cmake/mysql_version.cmake fails if LINK_FLAGS are modified
Backport version info handling  (Windows-specific) from next-mr. 
Instead of adding ".res" object as linker flag, add  resource file (.rc) file to the source list.
This is more obvious and less error prone method.
2010-11-12 13:42:50 +01:00
bc684baba2 Rename CMAKE_PARSE_ARGUMENTS macro to avoid name collision
with CMake 2.8.3 builtin macro
2010-09-29 11:42:35 +02:00
41d832d19b Bug #52850: mysqld-debug.pdb doesn't match
mysqld-debug.exe in 5.5.3 on windows

Fix:

- Do not rename PDB, install mysqld.pdb matching 
mysqld-debug.exe into bin\debug subdirectory

- Stack tracing code will now additionally look in 
debug subdirectory of the application directory 
for debug symbols.

- Small cleanup in stacktracing code: link with 
dbghelp rather than load functions dynamically 
at runtime, since dbghelp.dll is always present.

- Install debug binaries with WiX
2010-06-30 14:10:29 +02:00
50edf454b1 Merge 2010-04-21 14:58:09 +02:00
80fd4bef18 Apply wlad fixes from mysql-next-mr-bugfixing 2010-03-31 11:40:02 +02:00
e28ea740ad Back out remains of previous attempt. 2010-03-30 17:24:44 +02:00
98e33d14fa Fix from wlad. 2010-03-30 17:13:07 +02:00
2e160175c4 Try again.. 2010-03-30 13:37:17 +02:00
6740352b92 Try to fix the debug permissions stuff. 2010-03-30 12:32:38 +02:00
56700fd38c Install static client and embedded debug libraries 2010-02-20 20:40:03 +01:00
7e01172ce3 Fix a couple fo things replated to MSI 2010-02-16 16:06:57 +01:00
890c52d889 Add components to INSTALL, some eraly Wix support 2010-02-10 20:23:24 +01:00
b6779a71c4 When using SIGNCODE parameter, check that signing of test executable reaööy works.
If not,  write warning and disable signing

Also, set SIGNCODE in mysql_release build configuration.
2010-02-02 21:32:38 +01:00
54c5a4beef Simplify embedding version info into executables with ADD_VERSION_INFO 2009-12-18 23:53:30 +01:00
f31b16543a fix windows errors with version resource 2009-12-16 13:25:41 +01:00
833be37d95 Add version resource to windows executables 2009-12-16 02:51:13 +01:00
535d1fa97e Mark signing parameters as advanced 2009-12-13 00:17:42 +01:00
a8e3b18bba new option SIGNCODE to sign executables and dlls with digital certificates 2009-12-12 20:30:18 +01:00
4a0af44a81 remove debug message 2009-12-12 02:10:47 +01:00
c5d7bcf376 Cleanup, use MYSQL_INSTALL_TARGETS macro instead of INSTALL(TARGETS) combined with
INSTALL_DEBUG_SYMBOLS
2009-12-12 02:03:05 +01:00
ddfdb1b1d1 fix install_symlink on unixes other than osx 2009-12-10 03:48:21 +01:00
962d3fb94a Use CMAKE_CFG_INTDIR instead of different MSVC and Xcode specific
configuration names
2009-12-09 03:13:38 +01:00
afe4ee1e17 implement convenience libraries 2009-11-24 23:15:47 +00:00
13cd7170cc WL#5161 : Cross-platform build with CMake 2009-11-09 12:32:48 +01:00