summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@collabora.com>2019-05-26 20:39:42 +0200
committerMichael Stahl <Michael.Stahl@cib.de>2019-05-27 12:34:37 +0200
commit93139c011411b0e48c5fc8d39fe9203f55c7ff0a (patch)
tree066e51da38eb6e4f2b1176c580b73f1845007d27 /external
parent53325b40b557cc84d8d21c1baa0ef8d3bfc00ab8 (diff)
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.Stahl@cib.de>
Diffstat (limited to 'external')
-rw-r--r--external/libcmis/StaticLibrary_libcmis.mk4
1 files changed, 2 insertions, 2 deletions
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) \