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 /reportdesign | |
| parent | crashrep: fix conditionals: it used to be built in non-pro too (diff) | |
| download | core-a53586f4efe26b8875107d04001f4ecec760c343.tar.gz core-a53586f4efe26b8875107d04001f4ecec760c343.zip | |
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 'reportdesign')
| -rw-r--r-- | reportdesign/Library_rpt.mk | 2 | ||||
| -rw-r--r-- | reportdesign/Library_rptui.mk | 2 | ||||
| -rw-r--r-- | reportdesign/Library_rptxml.mk | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk index f6db9c2c8684..511da92a2d4b 100644 --- a/reportdesign/Library_rpt.mk +++ b/reportdesign/Library_rpt.mk @@ -38,6 +38,8 @@ $(eval $(call gb_Library_add_defs,rpt,\ -DREPORTDESIGN_DLLIMPLEMENTATION \ )) +$(eval $(call gb_Library_use_external,rpt,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,rpt)) $(eval $(call gb_Library_use_libraries,rpt,\ diff --git a/reportdesign/Library_rptui.mk b/reportdesign/Library_rptui.mk index 695b06ed3a34..5426367b9652 100644 --- a/reportdesign/Library_rptui.mk +++ b/reportdesign/Library_rptui.mk @@ -34,6 +34,8 @@ $(eval $(call gb_Library_set_include,rptui,\ -I$(SRCDIR)/reportdesign/source/ui/inc \ )) +$(eval $(call gb_Library_use_external,rptui,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,rptui)) $(eval $(call gb_Library_use_libraries,rptui,\ diff --git a/reportdesign/Library_rptxml.mk b/reportdesign/Library_rptxml.mk index ba8c96a65324..8ab669a0691b 100644 --- a/reportdesign/Library_rptxml.mk +++ b/reportdesign/Library_rptxml.mk @@ -33,6 +33,8 @@ $(eval $(call gb_Library_set_include,rptxml,\ -I$(SRCDIR)/reportdesign/source/inc \ )) +$(eval $(call gb_Library_use_external,rptxml,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,rptxml)) $(eval $(call gb_Library_use_libraries,rptxml,\ |