summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/10.2' into 10.3bb-10.3-janmergeJan Lindström2019-04-121-1/+1
|\
| * cmake: pass CMAKE_BUILD_TYPE into src.rpmSergei Golubchik2019-04-091-1/+1
| | | | | | | | and don't pass BUILD_CONFIG twice, once is enough.
* | Merge 10.2 into 10.3Marko Mäkelä2019-04-081-0/+5
|\ \ | |/
| * cmake: force Boost dependency as neededSergei Golubchik2019-04-081-0/+5
| | | | | | | | because FindBoost.cmake won't do it
* | Merge 10.2 into 10.3Marko Mäkelä2019-04-031-0/+2
|\ \ | |/
| * Merge 10.1 into 10.2Marko Mäkelä2019-04-031-0/+2
| |\
| | * speedup RPM buildsSergei Golubchik2019-04-021-0/+2
| | | | | | | | | | | | | | | Filter out most common file types from automatic dependency collection. This makes `make package` in centos73 VM three times faster
* | | Merge branch '10.2' into 10.3Sergei Golubchik2019-03-298-58/+94
|\ \ \ | |/ /
| * | post-merge: -Werror fixes in 10.2Sergei Golubchik2019-03-291-0/+5
| | |
| * | Merge branch '10.1' into 10.2Sergei Golubchik2019-03-297-58/+88
| |\ \ | | |/
| | * MDEV-7066 No Source RPMs ... (and so no "yum-builddep MariaDB-server" either)Sergei Golubchik2019-03-271-11/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | special cases: * change systemd detection to use CHECK_LIBRARY_EXISTS at least once, to have it detected by build_depends.cmake * similarly, use find_library for pam * unixODBC is weird, libodbc.so is in the unixODBC package, not in the unixODBC-devel, where normally all .so files belong. Packaging bug? As a workaround, use find_file(sql.h) instead of find_path(sql.h) to make sure that /usr/include/sql.h (not /usr/include) is cached by cmake, and later build_depends.cmake will select unixODBC-devel, as a package owning /usr/include/sql.h file.
| | * MDEV-7066 No Source RPMs ... (and so no "yum-builddep MariaDB-server" either)Sergei Golubchik2019-03-272-2/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automatic BuildRequires for source RPM: for every FILEPATH and "Have library XXX" cached variable, detect what rpm package it comes from and add it to the list of dependencies. That is, the source RPM will BuildRequire all those packages that were found by cmake when the source RPM was built. Presumably, our CMakeLists.txt won't check for libraries that aren't needed for a build. It supports libraries/executables/files found with FIND_LIBRARY FIND_FILE FIND_PROGRAM CHECK_LIBRARY_EXISTS
| | * MDEV-7066 No Source RPMs ... (and so no "yum-builddep MariaDB-server" either)Sergei Golubchik2019-03-271-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | create source RPM cpack-way when building binary packages, this source rpm will use same BUILD_CONFIG and WITH_SSL values that were used when creating the source RPM. Only do it for a reasonably new cmake, where source rpms are known to work (3.10.2 is ok, 3.5.2 is not). And force a shorter CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX so that a source rpm could be built from a standard location in /usr/src
| | * cmake: don't do fake rpm ProvidesSergei Golubchik2019-03-271-30/+6
| | | | | | | | | | | | instead remove internal modules from Requires/Provides
| | * cmake: fix cpack_source_ignore_filesSergei Golubchik2019-03-271-9/+11
| | | | | | | | | | | | | | | add defensive $ for filenames, don't include .gitattributes and *.rpm, correct rules for *.gz and *.zip
| | * cmake: remove workarounds for cmake bugs #13248 and #12864Sergei Golubchik2019-03-271-3/+0
| | | | | | | | | | | | since long we use a different workaround, our own CPackRPM wrapper
| | * cmake: re-enable -Werror in the maintainer modeSergei Golubchik2019-03-271-2/+7
| | | | | | | | | | | | | | | | | | now we can afford it. Fix -Werror errors. Note: * old gcc is bad at detecting uninit variables, disable it. * time_t is int or long, cast it for printf's
* | | Merge 10.2 into 10.3Marko Mäkelä2019-03-252-4/+6
|\ \ \ | |/ /
| * | cmake 3.14mariadb-10.2.23Sergei Golubchik2019-03-231-1/+5
| | | | | | | | | | | | new location for CPackRPM.cmake
| * | MDEV-18954 numa dynamic dependencySergei Golubchik2019-03-221-0/+1
| | | | | | | | | | | | don't link with libnuma in release builds
| * | cmake: remove unused variableSergei Golubchik2019-03-221-3/+0
| | |
* | | Merge 10.2 into 10.3Marko Mäkelä2019-03-112-4/+4
|\ \ \ | |/ /
| * | Merge 10.1 into 10.2Marko Mäkelä2019-03-112-2/+2
| |\ \ | | |/
| | * MDEV-17703 Add WITH_UBSAN switch to CMake similar to WITH_ASANEugene Kosov2019-03-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This can be useful: UBSAN_OPTIONS=log_path=/some/path clang users may want to increase stack size in include/my_pthread.h or enable some optimizations
| | * Fix the WITH_ASAN clang build of dynamic pluginsMarko Mäkelä2019-03-071-1/+1
| | |
* | | Merge branch '10.2' into bb-10.3-mergeOleksandr Byelkin2019-02-191-1/+1
|\ \ \ | |/ /
| * | Merge branch '10.1' into 10.2Oleksandr Byelkin2019-02-191-1/+1
| |\ \ | | |/
| | * Don't build aws_key_management plugin by defaultSergei Golubchik2019-02-191-1/+1
| | |
* | | Merge 10.2 into 10.3Marko Mäkelä2019-02-193-6/+9
|\ \ \ | |/ /
| * | typo cmake/submodules.cmakeLaurynas Biveinis2019-02-131-1/+1
| | | | | | | | | Co-Authored-By: grooverdan <daniel@linux.ibm.com>
| * | cmake/submodules: notify user about gitconfig for automatic updateDaniel Black2019-02-131-4/+8
| | |
| * | Merge 10.1 into 10.2Marko Mäkelä2019-02-032-6/+0
| |\ \ | | |/ | | | | | | | | | | | | Temporarily disable a test for commit 2175bfce3e9da8332f10ab0e0286dc93915533a2 because fixing it in 10.2 requires updating libmariadb.
| | * Merge 10.1 into 10.1Marko Mäkelä2019-02-022-2/+9
| | |\ | | | | | | | | | | | | This is joint work with Oleksandr Byelkin.
| | | * Merge branch '5.5' into 10.0Oleksandr Byelkin2019-01-281-1/+0
| | | |\
| | | | * Crude "auto-load-data-local-infile" modemariadb-5.5.63Sergei Golubchik2019-01-271-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable LOAD DATA LOCAL INFILE suport by default and auto-enable it for the duration of one query, if the query string starts with the word "load". In all other cases the application should enable LOAD DATA LOCAL INFILE support explicitly.
| | | * | Merge branch '5.5' into 10.0Oleksandr Byelkin2019-01-281-1/+10
| | | |\ \ | | | | |/
| | | | * MDEV-17615 cmake ssl error on musl/libresslSergei Golubchik2019-01-211-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | don't shortcut trying to test for openssl version, test what is actually needed for a code to compile
| * | | | Merge 10.1 into 10.2Marko Mäkelä2019-02-021-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '10.0-galera' into 10.1Oleksandr Byelkin2019-01-311-1/+1
| | |\ \ \
| | | * \ \ Merge remote-tracking branch 'origin/10.0' into 10.0-galeraJan Lindström2018-11-021-2/+3
| | | |\ \ \
| | | * \ \ \ Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galeraJan Lindström2018-10-305-22/+18
| | | |\ \ \ \
| | | | * \ \ \ Merge tag 'mariadb-5.5.62' into 5.5-galeramariadb-galera-5.5.62Jan Lindström2018-10-294-21/+17
| | | | |\ \ \ \
| | | | * | | | | Bump WSREP_PATCH_VERSIONVasil Dimov2018-10-101-1/+1
| | | | | | | | |
| | | | * | | | | Bump wsrep patch version to 25.23Teemu Ollakka2018-02-251-1/+1
| | | | | | | | |
| | | | * | | | | Merge tag 'mariadb-5.5.59' into 5.5-galeraJan Lindström2018-01-191-0/+1
| | | | |\ \ \ \ \
| | | | * | | | | | MW-406 Bumped up the wsrep patch version (5.5.57-25.22)Teemu Ollakka2017-10-191-1/+1
| | | | | | | | | |
| | | | * | | | | | MW-383 Bumped wsrep patch versionTeemu Ollakka2017-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan Lindström <jan.lindstrom@mariadb.com>
| | | | * | | | | | Merge tag 'mariadb-5.5.57' into 5.5-galeraJan Lindström2017-07-202-4/+10
| | | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge tag 'mariadb-5.5.56' into 5.5-galeraSachin Setiya2017-05-031-0/+3
| | | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge tag 'mariadb-5.5.55' into bb-5.5-sachin-mergeSachin Setiya2017-04-183-0/+32
| | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sachin Setiya <sachin.setiya@mariadb.com>
View Lorry Controller Status