diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-10-17 11:16:40 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-10-17 11:16:40 +0200 |
| commit | 42d5cd314a351e325b6099dd523bbef2e4e4317a (patch) | |
| tree | bdd0718e5bbbfbdfca65872269c9be1206d5761d /avmedia | |
| parent | b00b7a68a743db60e14a375140d3dfa1c9e6de48 (diff) | |
More fine grained disabling of -Werror for collada headers only
Change-Id: I4f80d480e6e053038b85f6b26f74abc5921c2f38
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/Library_avmedia.mk | 1 | ||||
| -rw-r--r-- | avmedia/source/framework/collada_headers.hxx | 29 | ||||
| -rw-r--r-- | avmedia/source/framework/modeltools.cxx | 2 |
3 files changed, 30 insertions, 2 deletions
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk index 7cc08fac16ef..6bfc7910a3b0 100644 --- a/avmedia/Library_avmedia.mk +++ b/avmedia/Library_avmedia.mk @@ -53,7 +53,6 @@ $(eval $(call gb_Library_add_exception_objects,avmedia,\ endif ifeq ($(ENABLE_COLLADA),TRUE) -$(eval $(call gb_Library_set_warnings_not_errors,avmedia)) ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_libs,avmedia,\ diff --git a/avmedia/source/framework/collada_headers.hxx b/avmedia/source/framework/collada_headers.hxx new file mode 100644 index 000000000000..e32e0692008a --- /dev/null +++ b/avmedia/source/framework/collada_headers.hxx @@ -0,0 +1,29 @@ +/* -*- 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/. + */ + +#ifndef INCLUDED_AVMEDIA_SOURCE_FRAMEWORK_COLLADA_HEADERS_HXX +#define INCLUDED_AVMEDIA_SOURCE_FRAMEWORK_COLLADA_HEADERS_HXX + +#include <sal/config.h> + +#if defined __GNUC__ +#pragma GCC system_header +#elif defined _MSC_VER +#pragma warning(push, 1) +#endif + +#include <COLLADA2GLTFWriter.h> + +#if defined _MSC_VER +#pragma warning(pop) +#endif + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/source/framework/modeltools.cxx b/avmedia/source/framework/modeltools.cxx index 4360f424f5cf..003c84ce349e 100644 --- a/avmedia/source/framework/modeltools.cxx +++ b/avmedia/source/framework/modeltools.cxx @@ -32,7 +32,7 @@ #include <config_features.h> #if HAVE_FEATURE_COLLADA -#include <COLLADA2GLTFWriter.h> +#include <collada_headers.hxx> #include <GLTFAsset.h> #endif |