[Libreoffice-commits] core.git: connectivity/CppunitTest_connectivity_commontools.mk connectivity/CppunitTest_connectivity_sharedresources.mk emfio/CppunitTest_emfio_emf_test.mk

[Stephan Bergmann (via logerrit)]

 connectivity/CppunitTest_connectivity_commontools.mk     |    2 ++
 connectivity/CppunitTest_connectivity_sharedresources.mk |    2 ++
 emfio/CppunitTest_emfio_emf_test.mk                      |    1 +
 3 files changed, 5 insertions(+)

New commits:
commit 97b3e455802cfc08568ec5e8379c509efe3e47b1
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Dec 6 19:33:59 2019 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Dec 6 21:33:55 2019 +0100

    Fix some new dependencies on boost_headers
    
    ...caused by a8cd98c437f2c3b5c4f7c139aa7223c5cfb74d1a "use o3tl::optional
    instead of pointer", see <https://ci.libreoffice.org/job/gerrit_mac/48607>:
    
    > In file included from /Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/connectivity/qa/connectivity/resource/sharedresources_test.cxx:10:
    > In file included from /Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/include/test/bootstrapfixture.hxx:16:
    > In file included from /Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/include/vcl/salctype.hxx:25:
    > In file included from /Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/include/vcl/graph.hxx:27:
    > In file included from /Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/include/vcl/bitmapex.hxx:23:
    > /Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/include/o3tl/optional.hxx:20:10: fatal error: 'boost/none.hpp' file not found
    > #include <boost/none.hpp>
    >          ^~~~~~~~~~~~~~~~
    > In file included from /Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/connectivity/qa/connectivity/commontools/FValue_test.cxx:20:
    > In file included from /Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/include/test/bootstrapfixture.hxx:16:
    > In file included from /Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/include/vcl/salctype.hxx:25:
    > In file included from /Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/include/vcl/graph.hxx:27:
    > In file included from /Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/include/vcl/bitmapex.hxx:23:
    > /Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/include/o3tl/optional.hxx:20:10: fatal error: 'boost/none.hpp' file not found
    > #include <boost/none.hpp>
    >          ^~~~~~~~~~~~~~~~
    > In file included from /Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/emfio/qa/cppunit/emf/EmfImportTest.cxx:13:
    > In file included from /Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/include/test/bootstrapfixture.hxx:16:
    > In file included from /Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/include/vcl/salctype.hxx:25:
    > In file included from /Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/include/vcl/graph.hxx:27:
    > In file included from /Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/include/vcl/bitmapex.hxx:23:
    > /Users/tdf/lode/jenkins/workspace/lo_gerrit/Config/macosx_clang_dbgutil/include/o3tl/optional.hxx:20:10: fatal error: 'boost/none.hpp' file not found
    > #include <boost/none.hpp>
    >          ^~~~~~~~~~~~~~~~
    
    Change-Id: I86ccc030a8f34b9ee6a853e843c9eb6f2d987406
    Reviewed-on: https://gerrit.libreoffice.org/84664
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/connectivity/CppunitTest_connectivity_commontools.mk b/connectivity/CppunitTest_connectivity_commontools.mk
index 15a9d7e4633e..81dfe9e6861d 100644
--- a/connectivity/CppunitTest_connectivity_commontools.mk
+++ b/connectivity/CppunitTest_connectivity_commontools.mk
@@ -14,6 +14,8 @@ $(eval $(call gb_CppunitTest_set_include,connectivity_commontools,\
 	$$(INCLUDE) \
 ))
 
+$(eval $(call gb_CppunitTest_use_external,connectivity_commontools,boost_headers))
+
 $(eval $(call gb_CppunitTest_use_ure,connectivity_commontools))
 $(eval $(call gb_CppunitTest_use_vcl,connectivity_commontools))
 
diff --git a/connectivity/CppunitTest_connectivity_sharedresources.mk b/connectivity/CppunitTest_connectivity_sharedresources.mk
index 78209cfbbdf0..9af3f8ca2442 100644
--- a/connectivity/CppunitTest_connectivity_sharedresources.mk
+++ b/connectivity/CppunitTest_connectivity_sharedresources.mk
@@ -15,6 +15,8 @@ $(eval $(call gb_CppunitTest_set_include,connectivity_sharedresources,\
 	$$(INCLUDE) \
 ))
 
+$(eval $(call gb_CppunitTest_use_external,connectivity_sharedresources,boost_headers))
+
 $(eval $(call gb_CppunitTest_use_ure,connectivity_sharedresources))
 $(eval $(call gb_CppunitTest_use_vcl,connectivity_sharedresources))
 
diff --git a/emfio/CppunitTest_emfio_emf_test.mk b/emfio/CppunitTest_emfio_emf_test.mk
index 4f892b42c27b..123e4b3549bd 100644
--- a/emfio/CppunitTest_emfio_emf_test.mk
+++ b/emfio/CppunitTest_emfio_emf_test.mk
@@ -10,6 +10,7 @@
 $(eval $(call gb_CppunitTest_CppunitTest,emfio_emf))
 
 $(eval $(call gb_CppunitTest_use_externals,emfio_emf,\
+    boost_headers \
     libxml2 \
 ))