external/libcmis/StaticLibrary_libcmis.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 93139c011411b0e48c5fc8d39fe9203f55c7ff0a
Author: Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Sun May 26 20:39:42 2019 +0200
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Mon May 27 12:34:37 2019 +0200
avoid gbuild warning about no PCH for libcmis
gb_LinkTarget_set_precompiled_header sets PCH_CXXFLAGS, so add_cxxflags
must go after it.
Change-Id: I527906661dcecff56a24d5733bd87b4c9bf96215
Reviewed-on: https://gerrit.libreoffice.org/73000
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@cib.de>
diff --git a/external/libcmis/StaticLibrary_libcmis.mk
b/external/libcmis/StaticLibrary_libcmis.mk
index 1cdf5f02b6ab..e74a3722146d 100644
--- a/external/libcmis/StaticLibrary_libcmis.mk
+++ b/external/libcmis/StaticLibrary_libcmis.mk
@@ -11,6 +11,8 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,libcmis))
$(eval $(call gb_StaticLibrary_set_warnings_disabled,libcmis))
+$(eval $(call
gb_StaticLibrary_set_precompiled_header,libcmis,$(SRCDIR)/external/libcmis/inc/pch/precompiled_libcmis))
+
ifeq ($(COM_IS_CLANG),TRUE)
# Avoid narrowing conversion error (even though the option is technically a
warning)
# caused by boost
@@ -23,8 +25,6 @@ $(eval $(call gb_StaticLibrary_add_defs,libcmis, \
-DBOOST_ALL_NO_LIB \
))
-$(eval $(call
gb_StaticLibrary_set_precompiled_header,libcmis,$(SRCDIR)/external/libcmis/inc/pch/precompiled_libcmis))
-
$(eval $(call gb_StaticLibrary_set_include,libcmis, \
-I$(call gb_UnpackedTarball_get_dir,libcmis/inc) \
-I$(call gb_UnpackedTarball_get_dir,libcmis/src/libcmis) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
