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 /basebmp | |
| 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 'basebmp')
| -rw-r--r-- | basebmp/CppunitTest_basebmp.mk | 2 | ||||
| -rw-r--r-- | basebmp/Library_basebmp.mk | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/basebmp/CppunitTest_basebmp.mk b/basebmp/CppunitTest_basebmp.mk index 4879303502de..ff20ac09ae1c 100644 --- a/basebmp/CppunitTest_basebmp.mk +++ b/basebmp/CppunitTest_basebmp.mk @@ -14,6 +14,8 @@ $(eval $(call gb_CppunitTest_set_include,basebmp_cpputest,\ $$(INCLUDE) \ )) +$(eval $(call gb_CppunitTest_use_external,basebmp_cpputest,boost_headers)) + ifeq ($(OS),ANDROID) $(eval $(call gb_CppunitTest_use_static_libraries,basebmp_cpputest,\ basebmp \ diff --git a/basebmp/Library_basebmp.mk b/basebmp/Library_basebmp.mk index 5f3de82840ff..3587d35c8ce5 100644 --- a/basebmp/Library_basebmp.mk +++ b/basebmp/Library_basebmp.mk @@ -13,7 +13,10 @@ $(eval $(call gb_Library_use_package,basebmp,basebmp_inc)) $(eval $(call gb_Library_use_sdk_api,basebmp)) -$(eval $(call gb_Library_use_external,basebmp,vigra_headers)) +$(eval $(call gb_Library_use_externals,basebmp,\ + boost_headers \ + vigra_headers \ +)) $(eval $(call gb_Library_use_libraries,basebmp,\ basegfx \ |