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 /RepositoryExternal.mk | |
| 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 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 55508304f8d1..b1642dea4ca6 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -288,9 +288,9 @@ endef endif -ifneq ($(SYSTEM_MYSQL_CPPCONN),) +ifneq ($(SYSTEM_MYSQL_CONNECTOR_CPP),) -define gb_LinkTarget__use_mysqlcppconn +define gb_LinkTarget__use_mysql-connector-cpp $(call gb_LinkTarget_add_libs,$(1),\ -lmysqlcppconn \ ) @@ -307,17 +307,17 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OXT,\ )) # note: this does not link mysqlcppconn, it is loaded via osl_loadModuleRelative -define gb_LinkTarget__use_mysqlcppconn +define gb_LinkTarget__use_mysql-connector-cpp -$(call gb_LinkTarget_use_unpacked,$(1),mysqlcppconn) +$(call gb_LinkTarget_use_unpacked,$(1),mysql-connector-cpp) $(call gb_LinkTarget_add_defs,$(1),\ -DCPPCONN_LIB_BUILD \ ) $(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,mysqlcppconn) \ - -I$(call gb_UnpackedTarball_get_dir,mysqlcppconn)/cppconn \ + -I$(call gb_UnpackedTarball_get_dir,mysql-connector-cpp) \ + -I$(call gb_UnpackedTarball_get_dir,mysql-connector-cpp)/cppconn \ $$(INCLUDE) \ ) |