From ba33189343a622bddb78657bbb111e5f10ba82a4 Mon Sep 17 00:00:00 2001
From: Luboš Luňák <l.lunak@collabora.com>
Date: Sun, 22 Sep 2019 22:08:56 +0200
Subject: add gbuild function for a common PCH and use it in sc/ and sax/
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

And make it simple to disable the whole feature by setting
gb_DISABLE_PCH_REUSE=1, just in case.
Also work around a possible BOOST_ALL_NO_LIB mismatch when
using the common PCH.

Change-Id: I96fd507edf1ada6242ac225026250e5a588d0193
Reviewed-on: https://gerrit.libreoffice.org/79365
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
---
 sax/CppunitTest_sax.mk            | 2 ++
 sax/CppunitTest_sax_attributes.mk | 2 ++
 sax/CppunitTest_sax_parser.mk     | 2 ++
 sax/CppunitTest_sax_xmlimport.mk  | 2 ++
 sax/Library_expwrap.mk            | 2 +-
 sax/Library_sax.mk                | 2 +-
 6 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'sax')

diff --git a/sax/CppunitTest_sax.mk b/sax/CppunitTest_sax.mk
index 652695cc9732..282ba2414e41 100644
--- a/sax/CppunitTest_sax.mk
+++ b/sax/CppunitTest_sax.mk
@@ -13,6 +13,8 @@ $(eval $(call gb_CppunitTest_use_sdk_api,sax))
 
 $(eval $(call gb_CppunitTest_use_external,sax,boost_headers))
 
+$(eval $(call gb_CppunitTest_use_common_precompiled_header,sax))
+
 $(eval $(call gb_CppunitTest_use_libraries,sax, \
 	sax \
 	sal \
diff --git a/sax/CppunitTest_sax_attributes.mk b/sax/CppunitTest_sax_attributes.mk
index 020ccc21436e..198629814fb8 100644
--- a/sax/CppunitTest_sax_attributes.mk
+++ b/sax/CppunitTest_sax_attributes.mk
@@ -9,6 +9,8 @@
 
 $(eval $(call gb_CppunitTest_CppunitTest,sax_attributes))
 
+$(eval $(call gb_CppunitTest_use_common_precompiled_header,sax_attributes))
+
 $(eval $(call gb_CppunitTest_add_exception_objects,sax_attributes, \
 	sax/qa/cppunit/attributes \
 ))
diff --git a/sax/CppunitTest_sax_parser.mk b/sax/CppunitTest_sax_parser.mk
index eafad95a06a2..4c1fe31015bd 100644
--- a/sax/CppunitTest_sax_parser.mk
+++ b/sax/CppunitTest_sax_parser.mk
@@ -9,6 +9,8 @@
 
 $(eval $(call gb_CppunitTest_CppunitTest,sax_parser))
 
+$(eval $(call gb_CppunitTest_use_common_precompiled_header,sax_parser))
+
 $(eval $(call gb_CppunitTest_add_exception_objects,sax_parser, \
 	sax/qa/cppunit/parser \
 ))
diff --git a/sax/CppunitTest_sax_xmlimport.mk b/sax/CppunitTest_sax_xmlimport.mk
index b8cc56dbb311..2e107363294b 100644
--- a/sax/CppunitTest_sax_xmlimport.mk
+++ b/sax/CppunitTest_sax_xmlimport.mk
@@ -9,6 +9,8 @@
 
 $(eval $(call gb_CppunitTest_CppunitTest,sax_xmlimport))
 
+$(eval $(call gb_CppunitTest_use_common_precompiled_header,sax_xmlimport))
+
 $(eval $(call gb_CppunitTest_add_exception_objects,sax_xmlimport, \
 sax/qa/cppunit/xmlimport \
 ))
diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk
index f4d811886ca0..7f4e9004c25a 100644
--- a/sax/Library_expwrap.mk
+++ b/sax/Library_expwrap.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_Library_set_include,expwrap,\
 	$$(INCLUDE) \
 ))
 
-$(eval $(call gb_Library_reuse_precompiled_header,expwrap,pch/inc/pch/precompiled_system))
+$(eval $(call gb_Library_use_common_precompiled_header,expwrap))
 
 $(eval $(call gb_Library_add_defs,expwrap,\
 	-DFASTSAX_DLLIMPLEMENTATION \
diff --git a/sax/Library_sax.mk b/sax/Library_sax.mk
index 7fff54b7eed7..6e84a042614d 100644
--- a/sax/Library_sax.mk
+++ b/sax/Library_sax.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_Library_set_include,sax,\
 
 $(eval $(call gb_Library_use_external,sax,boost_headers))
 
-$(eval $(call gb_Library_reuse_precompiled_header,sax,pch/inc/pch/precompiled_system))
+$(eval $(call gb_Library_use_common_precompiled_header,sax))
 
 $(eval $(call gb_Library_use_sdk_api,sax))
 
-- 
cgit