diff options
| author | Tamas Bunth <tamas.bunth@collabora.co.uk> | 2018-08-16 16:35:17 +0200 |
|---|---|---|
| committer | Tamás Bunth <btomi96@gmail.com> | 2018-08-24 17:19:51 +0200 |
| commit | 26b40fcfc67480e75bd9959b0c5cb9db10fdf6a1 (patch) | |
| tree | 0d36eda88da5d9f1a28a5b915494d08c55456a02 /connectivity/Module_connectivity.mk | |
| parent | 84c02b6d9f2fbe6658b58182f57d60e2bc797016 (diff) | |
Moving mysqlc into connectivity as a library
Additionally I erased the remains of the old mysql C++ connector.
Also update the code where the clang plugins were unhappy after moving
the mysqlc module.
Remove mysql-cpp-connector external.
Change-Id: I771cc7afacf5012fc349afb6b36828fb0fee5a66
Reviewed-on: https://gerrit.libreoffice.org/59200
Tested-by: Jenkins
Reviewed-by: Tamás Bunth <btomi96@gmail.com>
Diffstat (limited to 'connectivity/Module_connectivity.mk')
| -rw-r--r-- | connectivity/Module_connectivity.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk index 3ba7ecf01d41..0fc587daa340 100644 --- a/connectivity/Module_connectivity.mk +++ b/connectivity/Module_connectivity.mk @@ -20,7 +20,6 @@ $(eval $(call gb_Module_add_targets,connectivity,\ Configuration_calc \ Configuration_dbase \ Configuration_flat \ - Configuration_mysql \ Configuration_odbc \ Configuration_writer \ Library_calc \ @@ -28,7 +27,6 @@ $(eval $(call gb_Module_add_targets,connectivity,\ Library_dbpool2 \ Library_file \ Library_flat \ - Library_mysql \ $(if $(filter ANDROID IOS,$(OS)),,Library_odbc) \ Library_sdbc2 \ Library_writer \ @@ -81,6 +79,13 @@ $(eval $(call gb_Module_add_targets,connectivity,\ )) endif +ifeq ($(ENABLE_MARIADBC),TRUE) +$(eval $(call gb_Module_add_targets,connectivity,\ + Configuration_mysql \ + Library_mysqlc \ +)) +endif + ifneq ($(BUILD_POSTGRESQL_SDBC),) $(eval $(call gb_Module_add_targets,connectivity,\ Configuration_postgresql \ |