c5f6043b0f
Similar to libc++ in C++17 mode, some types like std::auto_ptr are indeed removed in C++17 mode by default, and need _HAS_AUTO_PTR_ETC=1 to be enabled (see <https://blogs.msdn.microsoft.com/vcblog/2017/12/08/c17-feature-removals- and-deprecations/>). Unlike libc++, also std::binary_function and std::unary_function are removed (and need the same _HAS_AUTO_PTR_ETC=1 to enable). So either set that flag to make external code build, or use patches (for external/mdds) to make externals' files included in LO proper still work there. Change-Id: I886cc0de8196255334ee03ec48cb4bc54d460afd Reviewed-on: https://gerrit.libreoffice.org/46514 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
67 lines
2.4 KiB
Makefile
67 lines
2.4 KiB
Makefile
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
|
#
|
|
# 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/.
|
|
#
|
|
|
|
$(eval $(call gb_Library_Library,orcus-parser))
|
|
|
|
$(eval $(call gb_Library_use_unpacked,orcus-parser,liborcus))
|
|
|
|
$(eval $(call gb_Library_use_externals,orcus-parser,\
|
|
boost_headers \
|
|
boost_system \
|
|
mdds_headers \
|
|
zlib \
|
|
))
|
|
|
|
$(eval $(call gb_Library_set_warnings_not_errors,orcus-parser))
|
|
|
|
$(eval $(call gb_Library_set_include,orcus-parser,\
|
|
-I$(call gb_UnpackedTarball_get_dir,liborcus)/include \
|
|
$$(INCLUDE) \
|
|
))
|
|
|
|
$(eval $(call gb_Library_add_defs,orcus-parser,\
|
|
-DBOOST_ALL_NO_LIB \
|
|
-D__ORCUS_PSR_BUILDING_DLL \
|
|
))
|
|
|
|
# Needed when building against MSVC in C++17 mode, as
|
|
# workdir/UnpackedTarball/liborcus/include/orcus/global.hpp uses std::unary_function:
|
|
$(eval $(call gb_Library_add_defs,orcus-parser, \
|
|
-D_HAS_AUTO_PTR_ETC=1 \
|
|
))
|
|
|
|
$(eval $(call gb_Library_set_generated_cxx_suffix,orcus-parser,cpp))
|
|
|
|
$(eval $(call gb_Library_add_generated_exception_objects,orcus-parser,\
|
|
UnpackedTarball/liborcus/src/parser/base64 \
|
|
UnpackedTarball/liborcus/src/parser/cell_buffer \
|
|
UnpackedTarball/liborcus/src/parser/css_parser_base \
|
|
UnpackedTarball/liborcus/src/parser/css_types \
|
|
UnpackedTarball/liborcus/src/parser/csv_parser_base \
|
|
UnpackedTarball/liborcus/src/parser/exception \
|
|
UnpackedTarball/liborcus/src/parser/json_global \
|
|
UnpackedTarball/liborcus/src/parser/json_parser_base \
|
|
UnpackedTarball/liborcus/src/parser/json_parser_thread \
|
|
UnpackedTarball/liborcus/src/parser/parser_base \
|
|
UnpackedTarball/liborcus/src/parser/parser_global \
|
|
UnpackedTarball/liborcus/src/parser/pstring \
|
|
UnpackedTarball/liborcus/src/parser/sax_parser_base \
|
|
UnpackedTarball/liborcus/src/parser/sax_token_parser \
|
|
UnpackedTarball/liborcus/src/parser/sax_token_parser_thread \
|
|
UnpackedTarball/liborcus/src/parser/stream \
|
|
UnpackedTarball/liborcus/src/parser/string_pool \
|
|
UnpackedTarball/liborcus/src/parser/tokens \
|
|
UnpackedTarball/liborcus/src/parser/types \
|
|
UnpackedTarball/liborcus/src/parser/xml_namespace \
|
|
UnpackedTarball/liborcus/src/parser/yaml_parser_base \
|
|
UnpackedTarball/liborcus/src/parser/zip_archive \
|
|
UnpackedTarball/liborcus/src/parser/zip_archive_stream \
|
|
))
|
|
|
|
# vim: set noet sw=4 ts=4:
|