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 /binaryurp | |
| 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 'binaryurp')
| -rw-r--r-- | binaryurp/CppunitTest_binaryurp_test-cache.mk | 2 | ||||
| -rw-r--r-- | binaryurp/CppunitTest_binaryurp_test-unmarshal.mk | 2 | ||||
| -rw-r--r-- | binaryurp/Library_binaryurp.mk | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/binaryurp/CppunitTest_binaryurp_test-cache.mk b/binaryurp/CppunitTest_binaryurp_test-cache.mk index 93b716ca5990..c2a7ffb1f3c9 100644 --- a/binaryurp/CppunitTest_binaryurp_test-cache.mk +++ b/binaryurp/CppunitTest_binaryurp_test-cache.mk @@ -28,6 +28,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,binaryurp_test-cache)) +$(eval $(call gb_CppunitTest_use_external,binaryurp_test-cache,boost_headers)) + $(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-cache,\ sal \ $(gb_UWINAPI) \ diff --git a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk index 09fbcce439fa..6eefea75c677 100644 --- a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk +++ b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk @@ -28,6 +28,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,binaryurp_test-unmarshal)) +$(eval $(call gb_CppunitTest_use_external,binaryurp_test-unmarshal,boost_headers)) + $(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-unmarshal,\ cppu \ cppuhelper \ diff --git a/binaryurp/Library_binaryurp.mk b/binaryurp/Library_binaryurp.mk index 223d9c8113d5..37b96e77ec4a 100644 --- a/binaryurp/Library_binaryurp.mk +++ b/binaryurp/Library_binaryurp.mk @@ -32,6 +32,8 @@ $(eval $(call gb_Library_set_componentfile,binaryurp,binaryurp/source/binaryurp) $(eval $(call gb_Library_use_sdk_api,binaryurp)) +$(eval $(call gb_Library_use_external,binaryurp,boost_headers)) + $(eval $(call gb_Library_use_libraries,binaryurp,\ cppu \ cppuhelper \ |