[Libreoffice-commits] core.git: sw/CppunitTest_sw_ooxmlexport8.mk sw/CppunitTest_sw_ooxmlimport2.mk sw/CppunitTest_sw_ooxmlimport.mk

[Luboš Luňák (via logerrit)]

 sw/CppunitTest_sw_ooxmlexport8.mk |    2 ++
 sw/CppunitTest_sw_ooxmlimport.mk  |    2 ++
 sw/CppunitTest_sw_ooxmlimport2.mk |    2 ++
 3 files changed, 6 insertions(+)

New commits:
commit e1e9796f521e6fb7a043af410db754891559b24a
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Sat Jan 18 14:05:24 2020 +0100
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Sat Jan 18 14:57:05 2020 +0100

    do not reuse common PCH if switching to Objective C++
    
    In those cases gbuild detects flags mismatch between the PCH
    and the source files (-x objective-c++ -fobjc-exceptions).
    
    Change-Id: I88d456f59f95afaf60e252e07151ece6667ed51b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87016
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/sw/CppunitTest_sw_ooxmlexport8.mk b/sw/CppunitTest_sw_ooxmlexport8.mk
index f873d05f8330..d5344cb1b78e 100644
--- a/sw/CppunitTest_sw_ooxmlexport8.mk
+++ b/sw/CppunitTest_sw_ooxmlexport8.mk
@@ -11,7 +11,9 @@
 
 $(eval $(call gb_CppunitTest_CppunitTest,sw_ooxmlexport8))
 
+ifneq ($(OS),MACOSX)
 $(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_ooxmlexport8))
+endif
 
 $(eval $(call gb_CppunitTest_add_exception_objects,sw_ooxmlexport8, \
     sw/qa/extras/ooxmlexport/ooxmlexport8 \
diff --git a/sw/CppunitTest_sw_ooxmlimport.mk b/sw/CppunitTest_sw_ooxmlimport.mk
index 44d03956d688..c6d111e5acc9 100644
--- a/sw/CppunitTest_sw_ooxmlimport.mk
+++ b/sw/CppunitTest_sw_ooxmlimport.mk
@@ -11,7 +11,9 @@
 
 $(eval $(call gb_CppunitTest_CppunitTest,sw_ooxmlimport))
 
+ifneq ($(OS),MACOSX)
 $(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_ooxmlimport))
+endif
 
 $(eval $(call gb_CppunitTest_add_exception_objects,sw_ooxmlimport, \
     sw/qa/extras/ooxmlimport/ooxmlimport \
diff --git a/sw/CppunitTest_sw_ooxmlimport2.mk b/sw/CppunitTest_sw_ooxmlimport2.mk
index dd0267663455..f47d7e35830b 100644
--- a/sw/CppunitTest_sw_ooxmlimport2.mk
+++ b/sw/CppunitTest_sw_ooxmlimport2.mk
@@ -11,7 +11,9 @@
 
 $(eval $(call gb_CppunitTest_CppunitTest,sw_ooxmlimport2))
 
+ifneq ($(OS),MACOSX)
 $(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_ooxmlimport2))
+endif
 
 $(eval $(call gb_CppunitTest_add_exception_objects,sw_ooxmlimport2, \
     sw/qa/extras/ooxmlimport/ooxmlimport2 \