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 /hwpfilter | |
| 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 'hwpfilter')
| -rw-r--r-- | hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk | 2 | ||||
| -rw-r--r-- | hwpfilter/Library_hwp.mk | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk index ac3779f4b391..572258da7a01 100644 --- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk +++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk @@ -30,6 +30,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,hwpfilter_test_hwpfilter)) +$(eval $(call gb_CppunitTest_use_external,hwpfilter_test_hwpfilter,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,hwpfilter_test_hwpfilter, \ hwpfilter/qa/cppunit/test_hwpfilter \ )) diff --git a/hwpfilter/Library_hwp.mk b/hwpfilter/Library_hwp.mk index 2681f966ab08..f6b6159dc7c1 100644 --- a/hwpfilter/Library_hwp.mk +++ b/hwpfilter/Library_hwp.mk @@ -41,7 +41,10 @@ $(eval $(call gb_Library_use_libraries,hwp,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_use_external,hwp,zlib)) +$(eval $(call gb_Library_use_externals,hwp,\ + boost_headers \ + zlib \ +)) ifeq ($(OS),WNT) |