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 /fpicker | |
| 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 'fpicker')
| -rw-r--r-- | fpicker/Library_fpicker.mk | 2 | ||||
| -rw-r--r-- | fpicker/Library_fps.mk | 2 | ||||
| -rw-r--r-- | fpicker/Library_fps_aqua.mk | 2 | ||||
| -rw-r--r-- | fpicker/Library_fps_office.mk | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/fpicker/Library_fpicker.mk b/fpicker/Library_fpicker.mk index a5cfbb7cf66c..d120d28cc986 100644 --- a/fpicker/Library_fpicker.mk +++ b/fpicker/Library_fpicker.mk @@ -29,6 +29,8 @@ $(eval $(call gb_Library_Library,fpicker)) $(eval $(call gb_Library_set_componentfile,fpicker,fpicker/source/generic/fpicker)) +$(eval $(call gb_Library_use_external,fpicker,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,fpicker)) $(eval $(call gb_Library_use_libraries,fpicker,\ diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk index b6b30571f73d..6311b856b00c 100644 --- a/fpicker/Library_fps.mk +++ b/fpicker/Library_fps.mk @@ -35,6 +35,8 @@ $(eval $(call gb_Library_use_packages,fps,\ vcl_inc \ )) +$(eval $(call gb_Library_use_external,fps,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,fps)) $(eval $(call gb_Library_add_defs,fps,\ diff --git a/fpicker/Library_fps_aqua.mk b/fpicker/Library_fps_aqua.mk index 241be777d272..4684b252f390 100644 --- a/fpicker/Library_fps_aqua.mk +++ b/fpicker/Library_fps_aqua.mk @@ -33,6 +33,8 @@ $(eval $(call gb_Library_use_packages,fps_aqua,\ vcl_inc \ )) +$(eval $(call gb_Library_use_external,fps_aqua,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,fps_aqua)) $(eval $(call gb_Library_use_system_darwin_frameworks,fps_aqua,\ diff --git a/fpicker/Library_fps_office.mk b/fpicker/Library_fps_office.mk index 58e3011fe7b6..10b6d065f9c5 100644 --- a/fpicker/Library_fps_office.mk +++ b/fpicker/Library_fps_office.mk @@ -29,6 +29,8 @@ $(eval $(call gb_Library_Library,fps_office)) $(eval $(call gb_Library_set_componentfile,fps_office,fpicker/source/office/fps_office)) +$(eval $(call gb_Library_use_external,fps_office,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,fps_office)) $(eval $(call gb_Library_set_include,fps_office,\ |