diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-06-01 09:18:20 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-06-01 12:23:21 +0200 |
| commit | f75ea45883e9cf858b6bc859479a300e9219534b (patch) | |
| tree | f6e1074d4db8926d1b1b91255d33a31c5456648a /mysqlc | |
| parent | bafbc97f56693b3ef0752259d59db37539777305 (diff) | |
mysqlc: add dummy library in the non-extension case
To be replaced with a real library once we no longer depend on
mysql-connector-cpp.
Change-Id: I8aab8c7e33b7b27c0a8faef875fbc6938e1845c7
Reviewed-on: https://gerrit.libreoffice.org/55161
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'mysqlc')
| -rw-r--r-- | mysqlc/Library_mysqlc.mk | 6 | ||||
| -rw-r--r-- | mysqlc/Module_mysqlc.mk | 4 | ||||
| -rw-r--r-- | mysqlc/source/dummy.cxx | 20 |
3 files changed, 30 insertions, 0 deletions
diff --git a/mysqlc/Library_mysqlc.mk b/mysqlc/Library_mysqlc.mk index 8eb207d4bd9e..6cb47081748e 100644 --- a/mysqlc/Library_mysqlc.mk +++ b/mysqlc/Library_mysqlc.mk @@ -9,6 +9,7 @@ $(eval $(call gb_Library_Library,mysqlc)) +ifeq ($(ENABLE_MARIADBC),TRUE) $(eval $(call gb_Library_use_externals,mysqlc,\ boost_headers \ mysql-connector-cpp \ @@ -57,5 +58,10 @@ $(eval $(call gb_Library_add_exception_objects,mysqlc,\ $(eval $(call gb_Library_set_componentfile,mysqlc,mysqlc/source/mysqlc)) $(eval $(call gb_Library_set_external_code,mysqlc)) +else +$(eval $(call gb_Library_add_exception_objects,mysqlc,\ + mysqlc/source/dummy \ +)) +endif # vim: set noet sw=4 ts=4: diff --git a/mysqlc/Module_mysqlc.mk b/mysqlc/Module_mysqlc.mk index 8274b0dc02e8..2577df5ffcdf 100644 --- a/mysqlc/Module_mysqlc.mk +++ b/mysqlc/Module_mysqlc.mk @@ -18,6 +18,10 @@ $(eval $(call gb_Module_add_targets,mysqlc,\ Extension_mysql-connector-ooo \ )) +else +$(eval $(call gb_Module_add_targets,mysqlc,\ + Library_mysqlc \ +)) endif # vim: set noet sw=4 ts=4: diff --git a/mysqlc/source/dummy.cxx b/mysqlc/source/dummy.cxx new file mode 100644 index 000000000000..05d4cc35b69e --- /dev/null +++ b/mysqlc/source/dummy.cxx @@ -0,0 +1,20 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include <sal/types.h> + +using namespace com::sun::star; + +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( + const sal_Char* /*pImplementationName*/, void* /*pServiceManager*/, void* /*pRegistryKey*/) +{ + return nullptr; +}; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |