diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-01-26 21:19:13 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-01-26 22:20:06 +0100 |
| commit | a53586f4efe26b8875107d04001f4ecec760c343 (patch) | |
| tree | 9b19f0ecf5b5a08cc056e3274a2eaba96894dec8 /writerfilter | |
| parent | 20773c2bb04631d9bfd60167ed091752f0deecee (diff) | |
gbuild: do not copy boost headers around
- do not use gb_UnpackedTarball_copy_header_files for boost
- adapt the optimization in concat-deps.c for new path
- use boost_headers in all LinkTargets that require it
- add explicit include paths to mysqlc, mysqlcppconn, libvisio, liborcus
Change-Id: I0c43e73ed43cc9d2e6bce8faf55e992d655a0bb9
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/CppunitTest_writerfilter_doctok.mk | 2 | ||||
| -rw-r--r-- | writerfilter/CppunitTest_writerfilter_rtftok.mk | 2 | ||||
| -rw-r--r-- | writerfilter/Library_writerfilter.mk | 5 |
3 files changed, 8 insertions, 1 deletions
diff --git a/writerfilter/CppunitTest_writerfilter_doctok.mk b/writerfilter/CppunitTest_writerfilter_doctok.mk index 26b89a1ceb54..11a1462fc093 100644 --- a/writerfilter/CppunitTest_writerfilter_doctok.mk +++ b/writerfilter/CppunitTest_writerfilter_doctok.mk @@ -28,6 +28,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,writerfilter_doctok)) +$(eval $(call gb_CppunitTest_use_external,writerfilter_doctok,boost_headers)) +k $(eval $(call gb_CppunitTest_add_exception_objects,writerfilter_doctok, \ writerfilter/qa/cppunittests/doctok/testdoctok \ )) diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk index ae981d84b8ba..7930df5fe38c 100644 --- a/writerfilter/CppunitTest_writerfilter_rtftok.mk +++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk @@ -30,6 +30,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,writerfilter_rtftok)) +$(eval $(call gb_CppunitTest_use_external,writerfilter_rtftok,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,writerfilter_rtftok, \ writerfilter/qa/cppunittests/rtftok/testrtftok \ )) diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk index 9220fa588f1e..872e6339cc4b 100644 --- a/writerfilter/Library_writerfilter.mk +++ b/writerfilter/Library_writerfilter.mk @@ -85,7 +85,10 @@ $(eval $(call gb_Library_use_libraries,writerfilter,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_use_external,writerfilter,libxml2)) +$(eval $(call gb_Library_use_externals,writerfilter,\ + boost_headers \ + libxml2 \ +)) $(eval $(call gb_Library_add_exception_objects,writerfilter,\ writerfilter/source/rtftok/rtfcharsets \ |