diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-09-14 16:12:55 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-09-15 11:06:18 +0200 |
| commit | b29402009831f8a96fd77fc1042c3004c224a350 (patch) | |
| tree | de1493051d57bcfdb60e5e9e6995a0691b936086 /mysqlc | |
| parent | 15b973ed64cb0c655b387c5022fc2ff0894520dd (diff) | |
consistent naming of externals: mysqlcppconn -> mysql-connector-cpp
Change-Id: Ibfb3aa69895eef6023c38e2ff3b7ae98a05f5820
Reviewed-on: https://gerrit.libreoffice.org/42300
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'mysqlc')
| -rw-r--r-- | mysqlc/Extension_mysql-connector-ooo.mk | 2 | ||||
| -rw-r--r-- | mysqlc/Library_mysqlc.mk | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mysqlc/Extension_mysql-connector-ooo.mk b/mysqlc/Extension_mysql-connector-ooo.mk index 1cb6fcf2337e..6cdf44967c6b 100644 --- a/mysqlc/Extension_mysql-connector-ooo.mk +++ b/mysqlc/Extension_mysql-connector-ooo.mk @@ -22,7 +22,7 @@ $(eval $(call gb_Extension_add_files,mysql-connector-ooo,images,\ $(SRCDIR)/icon-themes/galaxy/desktop/res/extension_32.png \ )) -ifeq ($(SYSTEM_MYSQL_CPPCONN),) +ifeq ($(SYSTEM_MYSQL_CONNECTOR_CPP),) $(eval $(call gb_Extension_add_library,mysql-connector-ooo,mysqlcppconn)) endif diff --git a/mysqlc/Library_mysqlc.mk b/mysqlc/Library_mysqlc.mk index 0cccc57c7380..8eb207d4bd9e 100644 --- a/mysqlc/Library_mysqlc.mk +++ b/mysqlc/Library_mysqlc.mk @@ -11,10 +11,10 @@ $(eval $(call gb_Library_Library,mysqlc)) $(eval $(call gb_Library_use_externals,mysqlc,\ boost_headers \ - mysqlcppconn \ + mysql-connector-cpp \ )) -ifeq ($(SYSTEM_MYSQL_CPPCONN),) +ifeq ($(SYSTEM_MYSQL_CONNECTOR_CPP),) $(eval $(call gb_Library_add_libs,mysqlc,\ $(if $(filter-out WNT,$(OS)),$(if $(filter MACOSX SOLARIS,$(OS)),-lz -lm,\ -rdynamic -lz -lcrypt -lnsl -lm)) \ @@ -36,7 +36,7 @@ $(eval $(call gb_Library_add_defs,mysqlc,\ -DMARIADBC_VERSION_MAJOR=$(MARIADBC_MAJOR) \ -DMARIADBC_VERSION_MINOR=$(MARIADBC_MINOR) \ -DMARIADBC_VERSION_MICRO=$(MARIADBC_MICRO) \ - $(if $(SYSTEM_MYSQL_CPPCONN),,\ + $(if $(SYSTEM_MYSQL_CONNECTOR_CPP),,\ -DCPPCONN_LIB=\"$(call gb_Library_get_runtime_filename,mysqlcppconn)\") \ $(if $(BUNDLE_MARIADB_CONNECTOR_C),-DBUNDLE_MARIADB=\"$(LIBMARIADB)\") \ )) |