diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-08-26 14:55:45 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-08-26 17:51:51 +0200 |
| commit | 5061663ce052087c6d5d0910d6f99358e26dbbd1 (patch) | |
| tree | 6edf890c25193d0b00104a2c553d851a7d218d0a /RepositoryExternal.mk | |
| parent | don't need dangling Library_mysqlcppconn.mk (diff) | |
| download | core-5061663ce052087c6d5d0910d6f99358e26dbbd1.tar.gz core-5061663ce052087c6d5d0910d6f99358e26dbbd1.zip | |
drop unnecessary SYSTEM_MYSQL_CONNECTOR_CPP
Change-Id: I41cfbf41247270d29e08e5125adc05aac198b175
Reviewed-on: https://gerrit.libreoffice.org/59608
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index f0acedbf654e..fa19152cd6fb 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -297,43 +297,6 @@ endef endif -ifneq ($(SYSTEM_MYSQL_CONNECTOR_CPP),) - -define gb_LinkTarget__use_mysql-connector-cpp -$(call gb_LinkTarget_add_libs,$(1),\ - -lmysqlcppconn \ -) - -$(call gb_LinkTarget_add_defs,$(1),\ - -DSYSTEM_MYSQL_CPPCONN \ -) -endef - -else - -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OXT,\ - mysqlcppconn \ -)) - -# note: this does not link mysqlcppconn, it is loaded via osl_loadModuleRelative -define gb_LinkTarget__use_mysql-connector-cpp - -$(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,mysql-connector-cpp) \ - -I$(call gb_UnpackedTarball_get_dir,mysql-connector-cpp)/cppconn \ - $$(INCLUDE) \ -) - -endef - -endif - ifneq ($(SYSTEM_ZLIB),) define gb_LinkTarget__use_zlib |