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 /tools | |
| 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 'tools')
| -rw-r--r-- | tools/CppunitTest_tools_test.mk | 2 | ||||
| -rw-r--r-- | tools/Library_tl.mk | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/tools/CppunitTest_tools_test.mk b/tools/CppunitTest_tools_test.mk index e753f49220d0..ccd83a324ad2 100644 --- a/tools/CppunitTest_tools_test.mk +++ b/tools/CppunitTest_tools_test.mk @@ -30,6 +30,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,tools_test)) +$(eval $(call gb_CppunitTest_use_external,tools_test,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,tools_test, \ tools/qa/cppunit/test_inetmime \ tools/qa/cppunit/test_pathutils \ diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk index ae274e32aa50..9ac7f16f7209 100644 --- a/tools/Library_tl.mk +++ b/tools/Library_tl.mk @@ -102,7 +102,10 @@ $(eval $(call gb_Library_add_exception_objects,tl,\ )) endif -$(eval $(call gb_Library_use_external,tl,zlib)) +$(eval $(call gb_Library_use_externals,tl,\ + boost_headers \ + zlib \ +)) ifeq ($(OS),WNT) |