summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* Changes to build using CMake according to existing release packages:Jonathan Perkin2010-05-125-92/+223
| | | | | | | | | | | | | | | | | | | | | | | | - Update/fix file layouts for each package type, add new types for native package formats including deb, rpm and svr4. - Build all plugins, including debug versions - Update compiler flags to match current release - Add missing @VAR@ expansions - Install correct mysqclient library symlinks - Fix icc/ia64 builds - Fix install of libmysqld-debug - Don't include mysql_embedded - Remove unpackaged manual pages to avoid missing files warnings - Don't install mtr's test suite
* WL#5030: Splitting mysql_priv.hMats Kindahl2010-04-211-9/+3
| | | | | Removing traces of mysql_priv.h from comments and other non-source files that were missed before.
* Bug #52149 - packaging differences in CMake buildVladislav Vaintroub2010-03-172-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Corrected some packaging bugs: - install mysqlservices library - install libmysqlclient_r.so.{16,16.0.0} as links to libmysqlclient.so - install libmysqld-debug.a - install my_safe_process, my_safe_kill and symlinks to mysql-test-run.pl (mtr, mysql-test-run) into correct place ${INSTALL_MYSQLTESTDIR} cmake/install_layout.cmake: Fix typo cmake/install_macros.cmake: Refactor INSTALL_SYMLINK to allow arbitrary symlink paths. Old version of this macro would make link extension the same as in target. This was not sufficient in some scenarios (would not allow for example libmysqlclient_r.so.16=>./libmysqlclient.so link) libmysql/CMakeLists.txt: Install extra symlinks to libmysqlclient.so (libmysqlclient_r.so.16 and libmysqlclient_r.so.16.0.0) for backward compatiblity. libmysqld/CMakeLists.txt: install libmysqld-debug.a libservices/CMakeLists.txt: install mysqlservices library mysql-test/lib/My/SafeProcess/CMakeLists.txt: install my_safe_process, my_safe_kill into correct place
* Fix typo (CMAKE_SIZEOF_VOIDP=>CMAKE_SIZEOF_VOID_P)Vladislav Vaintroub2010-03-082-4/+4
|
* mergeVladislav Vaintroub2010-03-032-0/+11
|\
| * Bug #51488 :missing features and change behavior in cmake runs compared toVladislav Vaintroub2010-03-032-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | autotools runs - Fix recognition of --with-debug=full in configure wrapper - Remove CMakeCache.txt in configure wrapper, to match the original - Fix recognition of max-no-ndb - Fix broken dependencies of mysql_fix_privilege_table.sql from mysql_system_tables.sql and mysql_system_tables_fix.sql - Add "distclean target" that informs user about appropriate bzr command cmake/configure.pl: - Recognize --with-debug=full, map to WITH_DEBUG_FULL - remove CMakeCache.txt, so the configuration is no more sticky (to match the original configure behavior) cmake/plugin.cmake: - Recognize WITH_MAX_NO_NDB, this fixes missing storage engines after BUILD/*max-no-ndb scripts mysql-test/CMakeLists.txt: test-force uses the same macros (MTR_FORCE) as test-bt* now scripts/CMakeLists.txt: - Fix broken dependency when producing mysql_fix_privilege_tables.sql, reported by Davi. We now concatenate 2 scripts in custom command that has dependency on both scripts rather than concatenating them at cmake time. sql/CMakeLists.txt: Address frequently asked question "where is distclean" by implementing distclean target that does nothing except pointing to appropriate bzr command. It is better not to call "bzr clean-tree" automatically, without user consent. It could clean new files that were meant to be added.
* | Auto-merge from mysql-next-mr.Alexander Nozdrin2010-02-258-19/+116
|\ \ | |/
| * Workaround crash with dtraced shared libraries under GCC 3.4.6 on 32 bit ↵Vladislav Vaintroub2010-02-251-2/+23
| | | | | | | | | | | | | | | | | | | | | | Solaris. Crash happens in dlopen() code when trying to load the library. Crash does not happen when library is not DTrace instrumented . Additionally, crash does not happen with default Solaris 10 GCC 3.4.3 and it does not happen if main executable is instrumented. So , just check for this specific situation (32 bit, GCC3.4.6 , Solaris) and disable Dtrace in shared libraries. We have only single plugin so far that is instrumented (ha_example)
| * On Solaris, overwrite CMake's proposed thread library -lthread with -lpthread. Vladislav Vaintroub2010-02-251-1/+1
| | | | | | | | | | | | -lthread works fine in most cases, but at least with gcc 3.4.6 on x86, dlopen() crashes when libpthread is not used. Note : the workaround existed prior and did not work since CMAKE_THREADS_LIBS_INIT was already in cache. Now, use SET(.. CACHE FORCE) to overwrite the cached value.
| * mergeVladislav Vaintroub2010-02-242-1/+3
| |\
| | * Some CMake packaging fixes:Jonathan Perkin2010-02-242-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove INSTALL-BINARY from installed docs directory, we provide a copy in the root directory (but perhaps this should be revisited later). - Disable audit_null and daemon_example plugins. - Fix the docs directory. - Remove mysql-test/Makefile.in - Build and install mysql_tzinfo_to_sql - Remove share/charsets/languages.html
| * | #51466 : Source packages are broken with cmake in a cmake-agnostic environmentVladislav Vaintroub2010-02-243-11/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the worst case possible scenario (no bzr, in-source build), make dist produced a package that compiled ok with autotools but failed to package because extra make_binary_distribution was found in source package and was not built. make_binary_distribution contained paths of the build machine. Fix: exclude some scripts that are produced in cmake build. Note that there is no good general fix for it in this specific scenario. it is advisable to build source packages out of source or in bzr repo.
| * | Fix --with-ssl mappping (--with-ssl=dir should be "yes" or Vladislav Vaintroub2010-02-241-2/+2
| |/ | | | | | | | | | | | | actually "system"), --with-ssl should be "bundled". Fixes error on sol-gcc-x86, where build machine had openssl but not the test box.
| * remove whitespace at the end of line in Makefile.am, to keep ↵Vladislav Vaintroub2010-02-231-1/+1
| | | | | | | | BUILD/autorun.sh silent
| * Bug #51414: Arguments with embedded spaces are not correctly handled by ↵Vladislav Vaintroub2010-02-231-1/+12
| | | | | | | | | | | | | | | | | | | | | | configure wrapper. The bug was that ./configure was passing paramers to subscripts as $@, and to handle embedded spaces it needs to be quoted as "$@". This resulting into a bug when ./configure was called e.g with CFLAGS='-m64 -Xstrconst'.. Additionally, fixed cmake/configure.pl did not handle environment variables passed on the command line. this is fixed in this push
| * Fix BUILD/compile-pentium64-xxx scripts, when ccache is present.Vladislav Vaintroub2010-02-221-0/+32
| | | | | | | | | | | | | | | | | | | | Fix contains of : - splitting CC/CXX if there are more that 2 space-delimited tokens, add the rest to CFLAGS (in this case CC was set to "ccache gcc --pipe", and this broke recognition of gcc compiler as CMake understands CC consisting of 2 space delimited tokens but not more) - add my_new.cc to mysys fle list if C++ operator new is not found. Always, not only for gcc (the original problem was that missing operator new when compiling with CXX=gcc)
* | After-fix for WL#1213Alexander Barkov2010-02-251-3/+3
|/ | | | | Fixing cmake files.
* Install static client and embedded debug librariesVladislav Vaintroub2010-02-202-0/+51
|
* extend configure-like perl wrapper for INSTALL_FOODIR variablesVladislav Vaintroub2010-02-201-1/+50
|
* SET FN_NO_CASE_SENSE to 1 on WindowsVladislav Vaintroub2010-02-201-0/+2
|
* fix typoVladislav Vaintroub2010-02-171-1/+1
|
* check for poll.hVladislav Vaintroub2010-02-141-0/+1
|
* mergeVladislav Vaintroub2010-02-061-5/+6
|\
| * fix OSX package names is OSX_DEPLOYMENT_TARGET is specifiedVladislav Vaintroub2010-02-051-5/+6
| |
* | mergeVladislav Vaintroub2010-02-061-1/+2
|/
* When using SIGNCODE parameter, check that signing of test executable ↵Vladislav Vaintroub2010-02-022-2/+25
| | | | | | | | reaööy works. If not, write warning and disable signing Also, set SIGNCODE in mysql_release build configuration.
* Define feature sets that correspond to different products (advanced, pro, ↵Vladislav Vaintroub2010-02-021-13/+80
| | | | enterprise etc)
* Do not run checks for strtok_r on Windows - we know the function is not there..Vladislav Vaintroub2010-01-291-0/+1
|
* Add windows system check cache that prevents tests from running, most are ↵vvaintroub2010-01-294-3/+358
| | | | | | | irrelevant anyway Add cached variable WITH_XXX_STORAGE_ENGINE for dynamic plugins that can be static or dynamic.
* do not redefine CPACK_PACKAGE_FILE_NAME, if it is already givenVladislav Vaintroub2010-01-281-1/+3
|
* prettification of package names and fix compile bug on OSX/ppcVladislav Vaintroub2010-01-284-49/+127
|
* Fix issues around MYSQL_TCP_PORT_DEFAULT (should be really 0 all the time)Vladislav Vaintroub2010-01-271-0/+4
|
* Added AIX, OS400 and Cygwin.Vladislav Vaintroub2010-01-274-1/+72
| | | | | This finishes of moving code from configure.cmake IF()'s to platform specific files
* mergeVladislav Vaintroub2010-01-271-2/+5
|\
| * Fix failing test cases on pushbuildVladislav Vaintroub2010-01-261-2/+5
| |
* | fix default architecture flag (v8) on sparc32 gcc that prevent mysql from ↵Vladislav Vaintroub2010-01-273-3/+75
|/ | | | compilng, add HPUX.cmake
* Fixed typos and failed mysqld--help test.Vladislav Vaintroub2010-01-262-4/+7
|
* Move FreeBSD specific hacks to cmake/os/FreeBSD.cmakeVladislav Vaintroub2010-01-261-0/+20
|
* Move OSX specific checks to cmake/os/Darwin.cmakeVladislav Vaintroub2010-01-262-1/+38
|
* WL#5161: Following Mats' suggestion, moved Solaris specific workaround to ↵Vladislav Vaintroub2010-01-262-1/+73
| | | | | | | cmake/os/SunOS.cmake cmake/os/SunOS.cmake: WL#5161: Moved Solaris specific workaround to cmake/os/SunOS.cmake
* WL#5161, implement Mats' suggeston to move platform specifics into own filesVladislav Vaintroub2010-01-263-2/+50
| | | | under cmake/os. This patch does it for Linux
* WL#5161: Implement Mats' suggestion of moving OS specific CMake code to OS ↵Vladislav Vaintroub2010-01-263-3/+190
| | | | | | | | | | | | | specific files, instead of polluting code with IF(CMAKE_SYSTEM_NAME MATCHES...), first on Windows. cmake/libutils.cmake: Fix the case in MERGE_LIBRARIES, where there is no dependency on OS libraries. cmake/os/Windows.cmake: Move windows specific code to cmake/os/Windows.cmake configure.cmake: Move some Windows code to cmake/os/Windows.cmake
* merge, add plugin/audit_null/CMakeLists.txtVladislav Vaintroub2010-01-261-1/+1
|
* In standalone package, default data subdirectory is "data", not "var"Vladislav Vaintroub2010-01-251-1/+1
|
* Fix smaller stuff: disable transitive linking for MERGE_LIBRARIES results,Vladislav Vaintroub2010-01-251-0/+1
| | | | | compile embedded with PIC to allow linking with shared libraries
* Handle different installation layouts.Vladislav Vaintroub2010-01-246-7/+143
| | | | | | | | | | | | | | | | | 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)
* Add -lmtmalloc to server linker flags on Solaris 10Vladislav Vaintroub2010-01-201-0/+4
| | | | and later
* Add Solaris sparc Sun Studio flagsVladislav Vaintroub2010-01-201-2/+13
|
* - another take on BUILD_CONFIG variable - use OPTION instead of SET for Vladislav Vaintroub2010-01-201-14/+20
| | | | | | 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
* Fix end-of-line characters in mysql_release.cmake to be unix-conformVladislav Vaintroub2010-01-191-92/+92
| | | | make -DBUILD_CONFIG=mysql_release work
View Lorry Controller Status