diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-01-12 09:35:06 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-07-07 11:43:19 +0200 |
| commit | 22aebadca79892ca0d18664d3943275a6ff0daa9 (patch) | |
| tree | 9c10630d27fcbfae441db4844ca9c98d40b734cf /xmlsecurity | |
| parent | 797fc6a002f0aa0148ccec9ec7408cc7c7bb75c6 (diff) | |
CppunitTest_xmlsecurity_signing: fix and enable on Windows
Change-Id: Ie107afbb6b2499f445670b50bf214cb91d6b1cac
(cherry picked from commit 29137eef25f437a1bcb9243cc9d86a6ae2277911)
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/CppunitTest_xmlsecurity_signing.mk | 1 | ||||
| -rw-r--r-- | xmlsecurity/Module_xmlsecurity.mk | 3 | ||||
| -rw-r--r-- | xmlsecurity/qa/unit/signing/signing.cxx | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk index 9cfa4763dcc9..f7739ef6eb18 100644 --- a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk +++ b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk @@ -17,6 +17,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,xmlsecurity_signing, \ $(eval $(call gb_CppunitTest_use_libraries,xmlsecurity_signing, \ comphelper \ + cppuhelper \ cppu \ sal \ sax \ diff --git a/xmlsecurity/Module_xmlsecurity.mk b/xmlsecurity/Module_xmlsecurity.mk index beea26bece77..f5fb0caf62d9 100644 --- a/xmlsecurity/Module_xmlsecurity.mk +++ b/xmlsecurity/Module_xmlsecurity.mk @@ -15,12 +15,9 @@ $(eval $(call gb_Module_add_targets,xmlsecurity,\ $(if $(filter-out ANDROID IOS,$(OS)),Library_xsec_xmlsec) \ )) -# FIXME find out what's the proper fix to get this linked on Windows -ifneq ($(OS),WNT) $(eval $(call gb_Module_add_slowcheck_targets,xmlsecurity,\ CppunitTest_xmlsecurity_signing \ )) -endif $(eval $(call gb_Module_add_l10n_targets,xmlsecurity,\ AllLangResTarget_xsec \ diff --git a/xmlsecurity/qa/unit/signing/signing.cxx b/xmlsecurity/qa/unit/signing/signing.cxx index 3c85fd49caa2..785fa8559040 100644 --- a/xmlsecurity/qa/unit/signing/signing.cxx +++ b/xmlsecurity/qa/unit/signing/signing.cxx @@ -32,7 +32,7 @@ #include <xmlsecurity/documentsignaturehelper.hxx> #include <xmlsecurity/xmlsignaturehelper.hxx> -#if !defined(MACOSX) && !defined(WNT) +#if !defined(MACOSX) using namespace com::sun::star; |