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 /testtools | |
| 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 'testtools')
| -rw-r--r-- | testtools/Library_bridgetest.mk | 2 | ||||
| -rw-r--r-- | testtools/Library_cppobj.mk | 2 | ||||
| -rw-r--r-- | testtools/StaticLibrary_bridgetest.mk | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/testtools/Library_bridgetest.mk b/testtools/Library_bridgetest.mk index 283521f78c4e..6a3063f1b333 100644 --- a/testtools/Library_bridgetest.mk +++ b/testtools/Library_bridgetest.mk @@ -40,6 +40,8 @@ $(eval $(call gb_Library_use_static_libraries,testtools_bridgetest,\ testtools_bridgetest_s \ )) +$(eval $(call gb_Library_use_external,testtools_bridgetest,boost_headers)) + $(eval $(call gb_Library_use_libraries,testtools_bridgetest,\ cppu \ cppuhelper \ diff --git a/testtools/Library_cppobj.mk b/testtools/Library_cppobj.mk index 0bbdf231fc9b..1d5fbe62658f 100644 --- a/testtools/Library_cppobj.mk +++ b/testtools/Library_cppobj.mk @@ -41,6 +41,8 @@ $(eval $(call gb_Library_use_api,testtools_cppobj,\ udkapi \ )) +$(eval $(call gb_Library_use_external,testtools_cppobj,boost_headers)) + $(eval $(call gb_Library_use_static_libraries,testtools_cppobj,\ testtools_bridgetest_s \ )) diff --git a/testtools/StaticLibrary_bridgetest.mk b/testtools/StaticLibrary_bridgetest.mk index 23254e7f13a8..5f943035f6ca 100644 --- a/testtools/StaticLibrary_bridgetest.mk +++ b/testtools/StaticLibrary_bridgetest.mk @@ -27,6 +27,8 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,testtools_bridgetest_s)) +$(eval $(call gb_StaticLibrary_use_external,testtools_bridgetest_s,boost_headers)) + $(eval $(call gb_StaticLibrary_use_packages,testtools_bridgetest_s,\ cppu_inc \ cppuhelper_inc \ |