Commit graph

1011 commits

Author SHA1 Message Date
Vladislav Vaintroub
ebf2e76289 merge, add plugin/audit_null/CMakeLists.txt 2010-01-26 05:39:48 +01:00
Vladislav Vaintroub
32f0a54628 In standalone package, default data subdirectory is "data", not "var" 2010-01-25 13:12:29 +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
135c25d165 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
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
c514d75ebb 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
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
6e84defdd4 Add -lmtmalloc to server linker flags on Solaris 10
and later
2010-01-20 17:21:38 +00: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
bc61d6e840 Add Solaris sparc Sun Studio flags 2010-01-20 00:28:47 +01:00
Vladislav Vaintroub
a71e4cf18e - 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
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
5d61e31d4d 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
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
6b596534c0 Add compiler flags used by the buildteam to do release 2010-01-19 01:47:51 +01:00
Vladislav Vaintroub
0139d40d26 Add compiler flags used by the buildteam to do release 2010-01-19 01:47:51 +01:00
Vladislav Vaintroub
0bdd08d996 Fix output name of embedded library,
honor OUTPUT_NAME in MERGE_LIBRARIES macro
2010-01-15 19:07:45 +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
2ed249e9e0 Added support for product names in package names 2010-01-15 15:11:59 +01:00
Kent Boortz
493ee9d330 Added support for product names in package names 2010-01-15 15:11:59 +01:00
Vladislav Vaintroub
8807608561 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
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
4c872d51f6 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
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
4fbd5ccd71 Address Kents comments: copy docs, remove autom4te.cache subdirectory if exists. 2010-01-09 00:38:19 +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
0f0e56b03a CMake 2.6.2 fix 2010-01-08 11:06:42 +01:00
vladislav vaintroub
b51195d651 CMake 2.6.2 fix 2010-01-08 11:06:42 +01:00
Vladislav Vaintroub
31548075cf Fix error with cmake 2.6 2010-01-08 10:33:28 +01:00
Vladislav Vaintroub
4da913b50d Fix error with cmake 2.6 2010-01-08 10:33:28 +01:00
Vladislav Vaintroub
cd1501a169 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
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
0fe9b8b35e Fix version string parsing 2010-01-07 02:58:55 +01:00
Vladislav Vaintroub
6c66620684 Fix version string parsing 2010-01-07 02:58:55 +01:00
Vladislav Vaintroub
400f9587c5 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
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
541edcc2e4 merge 2009-12-25 16:49:21 +01:00
Vladislav Vaintroub
e8bdef8fcd merge 2009-12-25 16:49:21 +01:00
Vladislav Vaintroub
0940d7d204 merge 2009-12-25 03:24:00 +01:00
Vladislav Vaintroub
57e3ba292a merge 2009-12-25 03:24:00 +01:00
Vladislav Vaintroub
f2d4808fbb enable Cygwin build again 2009-12-25 03:22:23 +01:00
Vladislav Vaintroub
e64ba44004 enable Cygwin build again 2009-12-25 03:22:23 +01:00
Vladislav Vaintroub
b3debb1de8 use systemtap on linux if installed, for dtrace functionality 2009-12-24 07:21:05 +01:00
Vladislav Vaintroub
f8d896fca5 use systemtap on linux if installed, for dtrace functionality 2009-12-24 07:21:05 +01:00
Vladislav Vaintroub
728c437a85 Fix build with LDFLAGS=--Wl,--as-needed on Linux 2009-12-19 22:15:10 +01:00
Vladislav Vaintroub
5c7a62287e Fix build with LDFLAGS=--Wl,--as-needed on Linux 2009-12-19 22:15:10 +01:00
Vladislav Vaintroub
27c0d595e9 Simplify embedding version info into executables with ADD_VERSION_INFO 2009-12-18 23:53:30 +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
c7d19daba5 add missing file to EXTRA_DIST 2009-12-18 01:32:01 +01:00