Commit Graph

159 Commits

Author SHA1 Message Date
f0956276ae Fixed FindMariaDBConnector.cmake failing even if connector is installed
This will remove the need to build the connector if it already exists as
a system library.
2016-03-05 06:04:36 +02:00
1a2bd8b234 Added FindLua.cmake from KitWare's repo for CMake 3.4.3
Some platforms did not have the FindLua.cmake file which caused errors on
configuration. Moved the invocation of find_package to the filter CMakeLists.txt
so that it is only called if the luafilter is built.
2016-03-03 16:42:48 +02:00
bb1e36e2a5 Updated connector version
The v2.2.1 tag had a bug where the timeouts were not working.
2016-03-02 21:27:34 +02:00
e1a8a6f373 Luafilter is not built by default
The luafilter requires the lua development libraries so it isn't built
by default.
2016-03-02 13:37:00 +02:00
1958df60cc Version updated to beta-1.4.0 2016-02-29 15:37:11 +02:00
4c3f7e320e Added configurable connector repo and tags
This allows different versions and repositories to be used when building
the MariaDB connector.
2016-02-17 20:42:11 +02:00
cfefc046e9 Merge branch 'release-1.3.0' into develop 2016-02-11 10:23:00 +02:00
2f65c3a7b8 MariaDB Connector C is build from source if it is not found on the system
The FindMariaDBConnector.cmake file now checks if the found library actually is
the MariaDB Connector-C library. If the found library is not the MariaDB
Connector-C, it will be built from source.
2016-02-03 11:35:01 +02:00
081bacdc64 Switched to MySQL client library headers for MaxScale
The include directories previously used by MaxScale were from the embedded
library. All parts of MaxScale apart from the query classifier now use
the client libraries.
2016-02-02 14:04:59 +02:00
7e36e1cbb1 Link against Connector-C.
Now, qc_mysqlembedded is linked against MySQL's embedded library,
and MaxScale itself against Connector-C.

So, in order to build MaxScale, Connector-C must be installed.
This has been tested with Connector-C 2.2.1.

The build variable MYSQLCLIENT_LIBRARIES is no longer used.
2016-01-29 16:50:31 +02:00
5e5a522d27 Rename EMBEDDED_LIB to MYSQL_EMBEDDED_LIB
Makes it clearer what embedded lib we are talking about.
2016-01-29 16:32:01 +02:00
59031adba6 MM monitor is built by default
Previously the mmmon module was not built unless -DBUILD_MMMON=Y was added to
the cmake command. The module is now a part of the default build.
2016-01-28 13:17:07 +02:00
608924beba Build pcre2 as PIC.
If pcre2 is to be included in a shared library, it needs to be PIC.
2016-01-22 15:09:50 +02:00
c1a906a60d Remove beta status.
Remove all references to beta. This is now 1.3.0.
2016-01-19 13:59:10 +02:00
40cfe1a864 Merge branch 'release-1.3.0' into develop 2016-01-08 11:14:02 +02:00
080a9ebc9d PCRE2 is now statically linked
Since the PCRE2 library was always going to be a part of MaxScale, there was
no real reason to have it as a shared library apart from smaller binaries.
2015-12-29 10:09:38 +02:00
e305a88e0e Enabled CPACK_DEBIAN_PACKAGE_SHLIBDEPS again
The removal of this from the DEB packages caused no dependencies to be generated.
2015-12-29 10:09:38 +02:00
acf80832ce Merge branch 'release-1.3.0' into develop
To get all fixes made to release-1.3.0 also into develop.
2015-12-14 14:09:51 +02:00
24abdb36b4 Update MAXSCALE_VERSION 2015-12-11 11:27:18 +02:00
dc64b12077 Fixed PCRE2 libraries missing symbolic link to library
The libpcre2-8.so was not a symbolic link but an actual library.
2015-12-11 06:43:16 +02:00
03b0f87257 Added MaxScale version numbers into the CMake cache
This will allow custom version numbers without modifying the source code.
2015-12-03 16:16:56 +02:00
5fc4f4913b Removed dpkg-shlibdeps part from DEB package building
The dpkg-shlibdebs was causing the Debian based systems to fail when the package
was being made. This makes the package builds work again.
2015-12-03 15:00:18 +02:00
350584ee28 Removed dpkg-shlibdeps part from DEB package building
The dpkg-shlibdebs was causing the Debian based systems to fail when the package
was being made. This makes the package builds work again.
2015-12-02 18:58:06 +02:00
ce20c638fc Cleaned up PCRE2 build process
Switched to ExternalProject CMake module to make the inclusion of external CMake
projects easier. This removes the rebuilding of the pcre2 libraries each time
the project is reconfigured.
2015-11-30 10:46:08 +02:00
f441f72b75 Added support for librabbitmq-c 0.6.0 and newer
The 0.6.0 version of librabbitmq-c added two parameters to amqp_exchange_declare
which allow auto-deleted and internal exchanges. This change requires more
advanced version detection so that code could be conditionally compiled for
newer versions of the library.
2015-11-27 12:21:19 +02:00
443bbe73d2 Mqfilter is built if possible
The mqfilter was not built by default even though it should have been. This has
been fixed but the filter is built only if librabbitmq is found. This was done
to avoid having the librabbitmq and its development headers as a hard
dependency.
2015-11-26 09:28:27 +02:00
d7e685e2fe Increased version number.
MaxScale version number set to 1.3.0-1.
2015-11-23 13:06:39 +02:00
23b2ce004b Added support for MariaDB 10.1 embedded library
The code used in the query classifier was not compatible with 10.1 version
of MariaDB and needed to be fine tuned in order for it to work with all
supported versions of MariaDB.
2015-11-23 11:41:05 +02:00
069297f47e Added BUILD_MMMON to CMake cache. 2015-11-17 14:16:32 +02:00
b22d40b06b Fixed PCRE2 beng built when CMake is configured
The bundled PCRE2 library will be built as a separate target and configuring
CMake no longer builds it. Instead, it will only be built when it is out of date.
This requires all targets to declare that they depend on the pcre2 target in
order for it to be built.
2015-11-16 13:59:47 +02:00
ee29e85016 Added bundled PCRE2 library. 2015-10-27 09:24:34 +02:00
0134fdc397 Merge branch 'release-1.2' into develop
Conflicts:
	server/core/dbusers.c
2015-07-13 15:52:36 +03:00
38b5166543 fixed double definition of CMake variables. 2015-07-13 13:03:15 +03:00
e03dcc07c3 Enabled C99 compiler options 2015-07-11 17:13:00 +03:00
f095ec353c Fixed config file being installed into /usr/etc instead of /etc. 2015-07-10 21:31:33 +03:00
b0e98bc420 Added template cnf file to /etc and renamed folders. 2015-07-09 14:41:23 +03:00
309b8bba97 Added missing --piddir option to testall maxscale invokation. 2015-07-04 09:07:37 +03:00
2c3c856ea1 Added option for C99 builds. 2015-06-29 16:01:56 +03:00
22053cfafb Updated MaxScale version to 1.2.0. 2015-06-26 10:36:27 +03:00
4cbcc4ecb6 Removed old unused cmake variables, updated documentation and fixed testall suite. 2015-05-26 15:12:29 +03:00
5f076b81d4 Merge branch 'install_dir_change' into develop
Conflicts:
	CMakeLists.txt
	Documentation/Tutorials/Administration-Tutorial.md
	log_manager/CMakeLists.txt
	server/core/CMakeLists.txt
	server/core/gateway.c
	server/core/maxkeys.c
	server/core/maxpasswd.c
	server/modules/filter/test/CMakeLists.txt
	server/modules/routing/CMakeLists.txt
2015-05-26 13:34:39 +03:00
2b457bf372 Updated init.d and systemd scripts. 2015-05-11 06:19:06 +03:00
88da984ea3 Added even more clarification to the non-release warning in FindMySQL.cmake 2015-04-30 11:42:56 +03:00
31be62774f Added a more descriptive warning when building MaxScale with source built MariaDB server. 2015-04-30 11:39:24 +03:00
5394b4d0fa Changed standard installation directory from /usr/local/mariadb-maxscale to /usr/local. 2015-04-29 05:42:58 +03:00
71531cde3e Updated package installation and started documentation update. 2015-04-28 11:09:49 +03:00
e681d18fdd Split packaging to RPM and DEB cmake files. 2015-04-27 23:11:49 +03:00
bbcecc0db5 Changed all MaxScale.cnf code references to maxscale.cnf 2015-04-27 13:44:36 +03:00
9eeec2e9d3 Added FindJemalloc.cmake 2015-04-27 04:52:29 +03:00
c500d23d04 Moved default file search paths to gwdirs.h which is configured by CMake from gwdirs.h.in. 2015-04-27 04:48:50 +03:00