Vladislav Vaintroub
19a2c052a5
WL#5161: Implement Mats' suggestion of moving OS specific CMake code to OS specific files, instead of
...
polluting code with IF(CMAKE_SYSTEM_NAME MATCHES...), first on Windows.
2010-01-26 13:47:34 +01:00
Vladislav Vaintroub
ebf2e76289
merge, add plugin/audit_null/CMakeLists.txt
2010-01-26 05:39:48 +01:00
Vladislav Vaintroub
261a29e20e
In standalone package, default data subdirectory is "data", not "var"
2010-01-25 13:12:29 +01:00
Vladislav Vaintroub
1519d8ccd1
Fix smaller stuff: disable transitive linking for MERGE_LIBRARIES results,
...
compile embedded with PIC to allow linking with shared libraries
2010-01-25 02:52:32 +01:00
Vladislav Vaintroub
c827968a2d
Handle different installation layouts.
...
using cmake option INSTALL_LAYOUT=STANDALONE would produce the layout as in
tar.gz or zip packages.
INSTALL_LAYOUT=UNIX will produce unixish install layout (with mysqld being in sbin subdirectory , libs in lib/mysql etc). This layout is used for RPM packages.
Subtle differences in both packages unfortunately lead to the need to recompile MySQL to use with other package type - as otherwise for example default plugins or data directories would be wrong set.
There are numerous other variables that allow fine-tuning packaging layout. (INSTALL_BINDIR, INSTALL_LIBDIR , INSTALL_PLUGINDIR etc).
This options are different from autotools as they do not expect full paths to directories, but only subdirectory of CMAKE_INSTALL_PREFIX.
There are 2 special options that expect full directory paths
- MYSQL_DATADIR that defines default MYSQL data directory (autotools equivalent
is --localstatedir)
- SYSCONFDIR can be added to search my.cnf search path (autotools equivalent is --sysconfdir)
2010-01-24 16:23:16 +01:00
Vladislav Vaintroub
4060fe7d43
Add -lmtmalloc to server linker flags on Solaris 10
...
and later
2010-01-20 17:21:38 +00:00
Vladislav Vaintroub
a28aa354fa
Add Solaris sparc Sun Studio flags
2010-01-20 00:28:47 +01:00
Vladislav Vaintroub
df2d0359d8
- another take on BUILD_CONFIG variable - use OPTION instead of SET for
...
boolean variables to ensure option is in cache. Also use documented CMAKE_USE_MAKE_RULES_OVERRIDE feature instead of INCLUDE.
- remove superfluous tests in innobase's CMakeLists.txt
2010-01-20 00:52:21 +01:00
Vladislav Vaintroub
7d1d78e574
Fix end-of-line characters in mysql_release.cmake to be unix-conform
...
make -DBUILD_CONFIG=mysql_release work
2010-01-19 02:21:48 +00:00
Vladislav Vaintroub
0139d40d26
Add compiler flags used by the buildteam to do release
2010-01-19 01:47:51 +01:00
Vladislav Vaintroub
266c812282
Fix output name of embedded library,
...
honor OUTPUT_NAME in MERGE_LIBRARIES macro
2010-01-15 19:07:45 +01:00
Kent Boortz
493ee9d330
Added support for product names in package names
2010-01-15 15:11:59 +01:00
Vladislav Vaintroub
5cddb6c15f
use _GNU_SOURCE on Linux to have all useful definitions (pthread_rwlock_t) for example
2010-01-13 16:52:14 +01:00
Vladislav Vaintroub
125cd58f2b
Add option for specifying MYSQL build configurations.
...
Add mysql_release.cmake intended for use by the build team (
compile options, build settings to do MySQL releases)
2010-01-11 14:42:07 +01:00
Vladislav Vaintroub
d882efd1c0
Address Kents comments: copy docs, remove autom4te.cache subdirectory if exists.
2010-01-09 00:38:19 +01:00
vladislav vaintroub
b51195d651
CMake 2.6.2 fix
2010-01-08 11:06:42 +01:00
Vladislav Vaintroub
4da913b50d
Fix error with cmake 2.6
2010-01-08 10:33:28 +01:00
Vladislav Vaintroub
10c0917897
some refactoring around readline/libedit
...
(handle dependent options, allow user with change WITH_READLINE to
WITH_LIBEDIT and other way around after the first compile)
2010-01-08 07:20:43 +01:00
Vladislav Vaintroub
6c66620684
Fix version string parsing
2010-01-07 02:58:55 +01:00
Vladislav Vaintroub
645628d4f3
Do not use fvisibility flag if GCC does not support it
...
(i.e if gcc version < 4)
2010-01-06 12:31:35 +00:00
Vladislav Vaintroub
e8bdef8fcd
merge
2009-12-25 16:49:21 +01:00
Vladislav Vaintroub
57e3ba292a
merge
2009-12-25 03:24:00 +01:00
Vladislav Vaintroub
e64ba44004
enable Cygwin build again
2009-12-25 03:22:23 +01:00
Vladislav Vaintroub
f8d896fca5
use systemtap on linux if installed, for dtrace functionality
2009-12-24 07:21:05 +01:00
Vladislav Vaintroub
5c7a62287e
Fix build with LDFLAGS=--Wl,--as-needed on Linux
2009-12-19 22:15:10 +01:00
Vladislav Vaintroub
54c5a4beef
Simplify embedding version info into executables with ADD_VERSION_INFO
2009-12-18 23:53:30 +01:00
Vladislav Vaintroub
b9d05f2b68
add missing file to EXTRA_DIST
2009-12-18 01:32:01 +01:00
Vladislav Vaintroub
7363c50346
add new file
2009-12-18 00:43:35 +01:00
Vladislav Vaintroub
555d46ea7f
Replace ADD_EXECUTABLE with MYSQL_ADD_EXECUTABLE for binaries that are installed.
...
MYSQL_ADD_EXECUTABLE will instructs CPack where to install the exe. On Windows, it also
adds version resource and if -DSIGNCODE was given, will sign the exe in packaging step.
2009-12-17 14:41:50 +01:00
Vladislav Vaintroub
2ff2d1873a
merge
2009-12-16 15:34:11 +01:00
Vladislav Vaintroub
f31b16543a
fix windows errors with version resource
2009-12-16 13:25:41 +01:00
Vladislav Vaintroub
ffb0926373
attempt to fix error in rc call
2009-12-16 03:51:07 +01:00
Vladislav Vaintroub
833be37d95
Add version resource to windows executables
2009-12-16 02:51:13 +01:00
Vladislav Vaintroub
826ecdb852
Dtrace on Solaris:
...
fix excessive relinking that results from rerunning
dtrace -G second time on the objects that come into
static library.
The reason for relinking is that dtrace -G changes
timestamp for the object file, which in turn results
in re-archiving the mysys on next time make runs,
which causes relinking of the whole mysql, because
everything depends on mysys.
The fix is to copy objects into temp before running
dtrace -G in mysqld pre-build step. This way dtrace
does not affect the object timestamp.
2009-12-13 05:42:26 +00:00
Vladislav Vaintroub
535d1fa97e
Mark signing parameters as advanced
2009-12-13 00:17:42 +01:00
Vladislav Vaintroub
a8e3b18bba
new option SIGNCODE to sign executables and dlls with digital certificates
2009-12-12 20:30:18 +01:00
Vladislav Vaintroub
4a0af44a81
remove debug message
2009-12-12 02:10:47 +01:00
Vladislav Vaintroub
c5d7bcf376
Cleanup, use MYSQL_INSTALL_TARGETS macro instead of INSTALL(TARGETS) combined with
...
INSTALL_DEBUG_SYMBOLS
2009-12-12 02:03:05 +01:00
Vladislav Vaintroub
670fb75598
Introduce macro DTRACE_INSTRUMENT_STATIC_LIBS,to hide
...
the ugly Solaris dtrace workarounds
2009-12-11 18:33:00 +00:00
Vladislav Vaintroub
6454d6e2c6
Introduce a workaround for Solaris' inability to deal with dtrace in static libraries.
...
Rerun dtrace -G on all objects that can contan dtrace probes (also objects that are
part of static libs) before linking mysqld to produce dtrace_probes_all.o and link
dtrace_probes_all.o with mysqld
This ugly workaround was inspired by handling dtrace using autotools.
2009-12-11 15:51:39 +01:00
Vladislav Vaintroub
ddfdb1b1d1
fix install_symlink on unixes other than osx
2009-12-10 03:48:21 +01:00
vvaintroub
962d3fb94a
Use CMAKE_CFG_INTDIR instead of different MSVC and Xcode specific
...
configuration names
2009-12-09 03:13:38 +01:00
Vladislav Vaintroub
b5761e6348
couple of tweaks for solaris on sparc, link with librt, as it defines sched_yield
2009-12-08 03:12:23 +01:00
Vladislav Vaintroub
a1ebd4245e
On Linux, support -Wl,--no-undefined (only client shared library)
...
and --Wl,--as-needed (all shared modules). The later will remove
unused dependencies (also from gcc and C++ runtime)
2009-12-07 02:16:05 +01:00
Vladislav Vaintroub
b358cc7f82
Fix creation of exports file on Unix
2009-12-05 13:16:30 +00:00
Vladislav Vaintroub
aea6035c73
merge
2009-12-04 20:05:04 +00:00
Vladislav Vaintroub
f7269ba0c7
fix build errors
2009-12-01 18:28:13 +00:00
Vladislav Vaintroub
a2a276b200
in RESTRICT_SYMBOL_EXPORTS,handle cases where COMPILE_FLAGS are not set
...
(COMPILE_FLAGS-NOTFOUND)
2009-12-01 14:35:09 +01:00
Vladislav Vaintroub
b5f2b3bc45
fix make dist errors
2009-12-01 14:18:53 +01:00
Vladislav Vaintroub
5dfa313eb7
- Introduce MYSQL_ADD_PLUGIN that replaces MYSQL_STORAGE_ENGINE
...
- Fix semisync library prefix (remove lib on Unixes)
- restrict exported symbols from zlib and yassl (fvisibility=hidden)
2009-12-01 12:00:50 +01:00
Vladislav Vaintroub
1e6f71a006
fix EXTRA_DIST crap
2009-11-25 01:55:47 +01:00
Vladislav Vaintroub
afe4ee1e17
implement convenience libraries
2009-11-24 23:15:47 +00:00
Vladislav Vaintroub
eb53bc5a2a
Write some helpful messages to assist user, when prerequisite software is not found
...
(ncurses-devel or bison)
2009-11-21 01:56:58 +01:00
Vladislav Vaintroub
c982aaa38c
Support out of source build with the wrapper configure.pl script
2009-11-17 04:45:11 +01:00
Vladislav Vaintroub
fbd542013f
Fixes for cmake2.8
2009-11-16 14:45:06 +01:00
Vladislav Vaintroub
12c7945b5b
correctly specify working directory for dtrace_prelink. Also, generate _dtrace.o in the object directory
2009-11-11 12:51:44 +00:00
Vladislav Vaintroub
13cd7170cc
WL#5161 : Cross-platform build with CMake
2009-11-09 12:32:48 +01:00
