summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* Merge 10.2 into 10.3Marko Mäkelä2020-06-021-0/+8
|\
| * cmake: quieterSergei Golubchik2020-05-311-0/+8
| |
* | Merge 10.2 into 10.3Marko Mäkelä2020-05-293-3/+5
|\ \ | |/
| * bintars should use bundled PCRESergei Golubchik2020-05-271-0/+1
| |
| * get rid of cmake warningSergei Golubchik2020-05-271-1/+1
| |
| * optimize performance of the build in a fresh cloneSergei Golubchik2020-05-271-2/+2
| | | | | | | | don't fetch the complete history of all submodules, it's rarely needed
| * don't include .git files in source packagesSergei Golubchik2020-05-271-0/+1
| | | | | | | | | | the existing ".git/" rule only filters out .git directories, but as we have submodules now, we have to filter out .git files too.
* | Merge branch '10.2' into 10.3mariadb-10.3.23Sergei Golubchik2020-05-091-0/+8
|\ \ | |/
| * Merge branch '10.1' into 10.2mariadb-10.2.32Oleksandr Byelkin2020-05-081-0/+8
| |\
| | * MDEV-21437 MariaDB's SUSE/SLES packages don't "provide" all of the same ↵Sergei Golubchik2020-05-051-0/+8
| | | | | | | | | | | | capabilities as the platform's default packages
* | | MDEV-22123 On RHEL8 mariadb-server is not providedSergei Golubchik2020-05-092-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setup alternative name for rhel8/centos8 use correct C/C version when providing mariadb-connector-c and other changes for installation over distro packages to work: dnf install mariadb-server dnf install --allowerasing MariaDB-{server,common,client,shared}*.rpm
* | | Merge 10.2 into 10.3Marko Mäkelä2020-04-281-0/+4
|\ \ \ | |/ /
| * | MDEV-21913 Add pam_user_map.so file to binary tarball packageSergei Golubchik2020-04-281-0/+4
| | |
| * | Merge 10.1 into 10.2Marko Mäkelä2020-04-271-7/+3
| |\ \ | | |/
| | * MDEV-22078 MariaDB-compat missing from MariaDB 10.4 CentOS 8 Yum RepoSergei Golubchik2020-04-271-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | Backport INSALL_SYMLINK cmake macro from 10.3. It'll make libmysqlclient_r.* symlinks to link to the actual shared library file, not to another symlink. As a bonus it'll fix cmake warning about deprecated LOCATION property
* | | Merge 10.2 into 10.3Marko Mäkelä2020-04-151-3/+9
|\ \ \ | |/ /
| * | Merge 10.1 into 10.2Marko Mäkelä2020-04-141-3/+9
| |\ \ | | |/
| | * MDEV-19740: Have MYSQL_MAINTAINER_MODE only enable -WerrorMarko Mäkelä2020-04-011-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let us enable all GCC and clang warnings independently of the MYSQL_MAINTAINER_MODE setting for both Debug and RelWithDebInfo builds, and have MYSQL_MAINTAINER_MODE only enable -Werror. The default setting of MYSQL_MAINTAINER_MODE=AUTO will continue to apply the -Werror only to CMAKE_BUILD_TYPE=Debug. To build a debug version without -Werror, MYSQL_MAINTAINER_MODE=OFF can be used.
* | | Merge branch '10.2' into 10.3Vicențiu Ciorbaru2020-03-081-7/+3
|\ \ \ | |/ /
| * | Update install layout to account for multi-arch setupDaniel Black2020-03-081-7/+3
| | | | | | | | | | | | | | | | | | | | | Cleanup install_layout to account for multi-arch setup and remove redundant defines in debian rules. Signed-off-by: Vicențiu Ciorbaru <vicentiu@mariadb.org>
* | | Merge branch '10.2' into 10.3Oleksandr Byelkin2020-03-062-0/+2
|\ \ \ | |/ /
| * | MENT-606 Error while setting value 'aes_ctr' to ↵Alexey Bychko2020-02-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | 'file-key-management-encryption-algorithm' cmake cannot detect openssl headers on Mac during checks. the solution is to add path to openssl includes to CMAKE_REQUIRED_INCLUDES before checks.
| * | Clean wrong cherry-pick from previous commitAnel Husakovic2020-02-201-1/+0
| | | | | | | | | | | | | | | - Delete variable HAVE_PTHREAD_CONDATTR_SETCLOCK and check - Delete second HAVE_PTHREAD_KEY_DELETE
| * | my_getncpus based on threads availableDaniel Black2020-02-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detecting the cpus based on sysconf of the online CPUs can significantly over estimate the number of cpus available. Wheither via numactl, cgroups, taskset, systemd constraints, docker containers and probably other mechanisms, the number of threads mysqld can be run on can be quite less. As such we use the pthread_getaffinity_np function on Linux and FreeBSD (identical API) to get the number of CPUs. The number of CPUs is the default for the thread_pool_size and a too high default will resulting in large memory usage and high context switching overhead. Closes PR #922
* | | MDEV-16662: cmake remove empty INSTALL_DEBUG_TARGETDaniel Black2020-02-252-88/+0
| | | | | | | | | | | | | | | | | | | | | No adverse effects since this was made a null function in 6b53f9d781cc19cbec96c3eb048e6407021685a2. This function had the last remaining cmake CMP0026 violation.
* | | MDEV-16662: cmake: CMP0026 compatible for dtraceDaniel Black2020-02-251-3/+2
| | | | | | | | | | | | | | | | | | | | | cmake enabling -DENABLE_DTRACE=ON is particularlly noisy with CMP0026 errors. Fixed in the same way as 6b53f9d781cc19cbec96c3eb048e6407021685a2
* | | Merge branch '10.2' into 10.3Oleksandr Byelkin2020-02-102-1/+3
|\ \ \ | |/ /
| * | Ignore /lib64 for rpmAnel Husakovic2020-02-101-0/+2
| | |
| * | MDEV-21656: Wrong directory for pam_user_map.soAurélien LEQUOY2020-02-061-1/+1
| | | | | | | | | | | | | | | | | | JIRA:https://jira.mariadb.org/browse/MDEV-17292 Closes #1443
* | | Merge branch '10.2' into 10.3Oleksandr Byelkin2020-01-242-13/+22
|\ \ \ | |/ /
| * | MDEV-17292 Package the pam_user_map moduleSergei Golubchik2020-01-212-0/+9
| | |
| * | cleanup: simplify install_layout.cmakeSergei Golubchik2020-01-211-13/+13
| | |
| * | MDEV-21082: isnan/isinf compilation errors, isfinite warnings on MacOSVlad Lesin2019-11-191-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix consists of three commits backported from 10.3: 1) Cleanup isnan() portability checks (cherry picked from commit 7ffd7fe9627d1f750a3712aebb4503e5ae8aea8e) 2) Cleanup isinf() portability checks Original problem reported by Wlad: re-compilation of 10.3 on top of 10.2 build would cache undefined HAVE_ISINF from 10.2, whereas it is expected to be 1 in 10.3. std::isinf() seem to be available on all supported platforms. (cherry picked from commit bc469a0bdf85400f7a63834f5b7af1a513dcdec9) 3) Use std::isfinite in C++ code This is addition to parent revision fixing build failures. (cherry picked from commit 54999f4e75f42baca484ae436b382ca8817df1dd)
* | | RPM packaging fixes for FC31Sergei Golubchik2019-11-281-3/+5
| | | | | | | | | | | | | | | | | | Obsoletes: cannot contain (x86-64) anymore Python shebang must be specific
* | | Fix clang-cl build on WindowsVladislav Vaintroub2019-10-301-1/+1
| | |
* | | Merge remote-tracking branch 'origin/10.2' into 10.3Alexander Barkov2019-09-241-2/+2
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/10.1' into 10.2Alexander Barkov2019-09-241-2/+2
| |\ \ | | |/
| | * Merge remote-tracking branch 'origin/5.5' into 10.1Alexander Barkov2019-09-241-2/+2
| | |\
| | | * MDEV-20596 Configure fails with newer CMakeRyan Coe2019-09-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix build error with newer cmake Fixes the following build error: CMake Error at cmake/os/Linux.cmake:29 (STRING): STRING sub-command REPLACE requires at least four arguments. Call Stack (most recent call first): CMakeLists.txt:101 (INCLUDE) CMake Error at cmake/os/Linux.cmake:29 (STRING): STRING sub-command REPLACE requires at least four arguments. Call Stack (most recent call first): CMakeLists.txt:101 (INCLUDE) The error happens when CMAKE_SHARED_LINKER_{LANG}_FLAGS is not set. Force the variable to be set to "" as input to prevent this. Signed-off-by: Ryan Coe <bluemrp9@gmail.com> Signed-off-by: Vicențiu Ciorbaru <vicentiu@mariadb.org>
* | | | Merge 10.2 into 10.3Marko Mäkelä2019-09-231-2/+20
|\ \ \ \ | |/ / /
| * | | MDEV-20570 : Packaging fails "The specified timestamp server either could ↵Vladislav Vaintroub2019-09-121-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not be reached" On Windows, during packaging step, if signing fails, retry signtool again without timestamp parameter. Fixes sporadic (rare) failures on buildbot
* | | | Merge 10.2 into 10.3Marko Mäkelä2019-09-101-0/+7
|\ \ \ \ | |/ / /
| * | | MDEV-20542 Windows enable/d2OptimizeHugeFunctionsVladislav Vaintroub2019-09-091-0/+2
| | | |
| * | | On Windows, treat linker warnings as errors, ifVladislav Vaintroub2019-09-091-0/+5
| | | | | | | | | | | | | | | | MYSQL_MAINTAINER_MODE is ERR
* | | | Merge branch '10.2' into 10.3Sergei Golubchik2019-09-061-1/+1
|\ \ \ \ | |/ / /
| * | | use a shorter name for sources in debuginfo rpmsSergei Golubchik2019-09-061-1/+1
| | | | | | | | | | | | | | | | have the same path as in source rpms, don't build them differently
* | | | Merge 10.2 into 10.3Marko Mäkelä2019-08-292-1/+3
|\ \ \ \ | |/ / /
| * | | Merge 10.1 into 10.2Marko Mäkelä2019-08-282-1/+3
| |\ \ \ | | |/ /
| | * | ensure that pam plugin is present in release packagesSergei Golubchik2019-08-201-0/+1
| | | |
| | * | really make CPACK_RPM_DEBUGINFO_PACKAGE configurableSergei Golubchik2019-08-201-1/+2
| | | |
View Lorry Controller Status