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 /sc | |
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 'sc')
26 files changed, 52 insertions, 4 deletions
diff --git a/sc/CppunitTest_sc_annotationobj.mk b/sc/CppunitTest_sc_annotationobj.mk index 16b2d489db26..7f8b9330b9cc 100644 --- a/sc/CppunitTest_sc_annotationobj.mk +++ b/sc/CppunitTest_sc_annotationobj.mk @@ -30,6 +30,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_annotationobj)) +$(eval $(call gb_CppunitTest_use_external,sc_annotationobj,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,sc_annotationobj, \ sc/qa/extras/scannotationobj \ )) diff --git a/sc/CppunitTest_sc_annotationshapeobj.mk b/sc/CppunitTest_sc_annotationshapeobj.mk index 841b34a450a9..c85f6fd73f19 100644 --- a/sc/CppunitTest_sc_annotationshapeobj.mk +++ b/sc/CppunitTest_sc_annotationshapeobj.mk @@ -30,6 +30,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_annonationshapeobj)) +$(eval $(call gb_CppunitTest_use_external,sc_annonationshapeobj,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,sc_annonationshapeobj, \ sc/qa/extras/scannotationshapeobj \ )) diff --git a/sc/CppunitTest_sc_annotationsobj.mk b/sc/CppunitTest_sc_annotationsobj.mk index bfd82bc7eeb9..5304cd6d2c75 100644 --- a/sc/CppunitTest_sc_annotationsobj.mk +++ b/sc/CppunitTest_sc_annotationsobj.mk @@ -30,6 +30,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_annotationsobj)) +$(eval $(call gb_CppunitTest_use_external,sc_annotationsobj,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,sc_annotationsobj, \ sc/qa/extras/scannotationsobj \ )) diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk index b0a63217668a..4f1aaf34207c 100644 --- a/sc/CppunitTest_sc_cellrangeobj.mk +++ b/sc/CppunitTest_sc_cellrangeobj.mk @@ -30,6 +30,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_cellrangesbase)) +$(eval $(call gb_CppunitTest_use_external,sc_cellrangesbase,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,sc_cellrangesbase, \ sc/qa/extras/sccellrangeobj\ )) diff --git a/sc/CppunitTest_sc_databaserangeobj.mk b/sc/CppunitTest_sc_databaserangeobj.mk index b1fd1bc89872..7d616737142e 100644 --- a/sc/CppunitTest_sc_databaserangeobj.mk +++ b/sc/CppunitTest_sc_databaserangeobj.mk @@ -30,6 +30,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_databaserangeobj)) +$(eval $(call gb_CppunitTest_use_external,sc_databaserangeobj,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,sc_databaserangeobj, \ sc/qa/extras/scdatabaserangeobj \ )) diff --git a/sc/CppunitTest_sc_datapilotfieldobj.mk b/sc/CppunitTest_sc_datapilotfieldobj.mk index 7d86cb573941..74ced87da3e6 100644 --- a/sc/CppunitTest_sc_datapilotfieldobj.mk +++ b/sc/CppunitTest_sc_datapilotfieldobj.mk @@ -30,6 +30,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_datapilotfieldobj)) +$(eval $(call gb_CppunitTest_use_external,sc_datapilotfieldobj,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,sc_datapilotfieldobj, \ sc/qa/extras/scdatapilotfieldobj \ )) diff --git a/sc/CppunitTest_sc_datapilottableobj.mk b/sc/CppunitTest_sc_datapilottableobj.mk index 33207173b07a..ce86c01117f3 100644 --- a/sc/CppunitTest_sc_datapilottableobj.mk +++ b/sc/CppunitTest_sc_datapilottableobj.mk @@ -30,6 +30,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_datapilottableobj)) +$(eval $(call gb_CppunitTest_use_external,sc_datapilottableobj,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,sc_datapilottableobj, \ sc/qa/extras/scdatapilottableobj \ )) diff --git a/sc/CppunitTest_sc_editfieldobj_cell.mk b/sc/CppunitTest_sc_editfieldobj_cell.mk index b4f80621f9f6..f499daa03411 100644 --- a/sc/CppunitTest_sc_editfieldobj_cell.mk +++ b/sc/CppunitTest_sc_editfieldobj_cell.mk @@ -30,6 +30,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_editfieldobj_cell)) +$(eval $(call gb_CppunitTest_use_external,sc_editfieldobj_cell,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,sc_editfieldobj_cell, \ sc/qa/extras/sceditfieldobj-cell \ )) diff --git a/sc/CppunitTest_sc_editfieldobj_header.mk b/sc/CppunitTest_sc_editfieldobj_header.mk index ba55b6515208..d92a4782f23f 100644 --- a/sc/CppunitTest_sc_editfieldobj_header.mk +++ b/sc/CppunitTest_sc_editfieldobj_header.mk @@ -30,6 +30,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_editfieldobj_header)) +$(eval $(call gb_CppunitTest_use_external,sc_editfieldobj_header,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,sc_editfieldobj_header, \ sc/qa/extras/sceditfieldobj-header \ )) diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk index e058a5505d29..59b577ad39b0 100644 --- a/sc/CppunitTest_sc_filters_test.mk +++ b/sc/CppunitTest_sc_filters_test.mk @@ -38,6 +38,7 @@ $(eval $(call gb_CppunitTest_add_defs,sc_filters_test,\ endif $(eval $(call gb_CppunitTest_use_externals,sc_filters_test, \ + boost_headers \ mdds_headers \ orcus \ )) diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk index d6c812ccb5ae..362a65e7ea49 100644 --- a/sc/CppunitTest_sc_macros_test.mk +++ b/sc/CppunitTest_sc_macros_test.mk @@ -27,6 +27,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_macros_test)) +$(eval $(call gb_CppunitTest_use_external,sc_macros_test,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,sc_macros_test, \ sc/qa/extras/macros-test \ )) diff --git a/sc/CppunitTest_sc_modelobj.mk b/sc/CppunitTest_sc_modelobj.mk index de62eb6475d4..9f8308f79916 100644 --- a/sc/CppunitTest_sc_modelobj.mk +++ b/sc/CppunitTest_sc_modelobj.mk @@ -30,6 +30,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_modelobj)) +$(eval $(call gb_CppunitTest_use_external,sc_modelobj,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,sc_modelobj, \ sc/qa/extras/scmodelobj \ )) diff --git a/sc/CppunitTest_sc_namedrangeobj.mk b/sc/CppunitTest_sc_namedrangeobj.mk index c2f1d438dd09..b9acb355652c 100644 --- a/sc/CppunitTest_sc_namedrangeobj.mk +++ b/sc/CppunitTest_sc_namedrangeobj.mk @@ -30,6 +30,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_namedrangeobj)) +$(eval $(call gb_CppunitTest_use_external,sc_namedrangeobj,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,sc_namedrangeobj, \ sc/qa/extras/scnamedrangeobj \ )) diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk index 84d7f371c5a3..0d80f8d70c9f 100644 --- a/sc/CppunitTest_sc_namedrangesobj.mk +++ b/sc/CppunitTest_sc_namedrangesobj.mk @@ -30,6 +30,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_namedrangesobj)) +$(eval $(call gb_CppunitTest_use_external,sc_namedrangesobj,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,sc_namedrangesobj, \ sc/qa/extras/scnamedrangesobj \ )) diff --git a/sc/CppunitTest_sc_outlineobj.mk b/sc/CppunitTest_sc_outlineobj.mk index 78170354015b..c43dc51c8e5f 100644 --- a/sc/CppunitTest_sc_outlineobj.mk +++ b/sc/CppunitTest_sc_outlineobj.mk @@ -34,6 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_outlineobj, \ sc/qa/extras/scoutlineobj \ )) +$(eval $(call gb_CppunitTest_use_external,sc_outlineobj,boost_headers)) + $(eval $(call gb_CppunitTest_use_libraries,sc_outlineobj, \ avmedia \ basegfx \ diff --git a/sc/CppunitTest_sc_rangelst_test.mk b/sc/CppunitTest_sc_rangelst_test.mk index 44c6b5266696..3aac87cc45f8 100644 --- a/sc/CppunitTest_sc_rangelst_test.mk +++ b/sc/CppunitTest_sc_rangelst_test.mk @@ -27,6 +27,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_rangelst_test)) +$(eval $(call gb_CppunitTest_use_external,sc_rangelst_test,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,sc_rangelst_test, \ sc/qa/unit/rangelst_test \ )) diff --git a/sc/CppunitTest_sc_subsequent_export_test.mk b/sc/CppunitTest_sc_subsequent_export_test.mk index 41a6855d061f..d64832d9cff1 100644 --- a/sc/CppunitTest_sc_subsequent_export_test.mk +++ b/sc/CppunitTest_sc_subsequent_export_test.mk @@ -32,6 +32,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_subsequent_export_test, \ )) $(eval $(call gb_CppunitTest_use_externals,sc_subsequent_export_test, \ + boost_headers \ mdds_headers \ orcus \ )) diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk index 68e943d0d811..63ebc938fc77 100644 --- a/sc/CppunitTest_sc_subsequent_filters_test.mk +++ b/sc/CppunitTest_sc_subsequent_filters_test.mk @@ -32,6 +32,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_subsequent_filters_test, \ )) $(eval $(call gb_CppunitTest_use_externals,sc_subsequent_filters_test, \ + boost_headers \ mdds_headers \ orcus \ )) diff --git a/sc/CppunitTest_sc_tablesheetobj.mk b/sc/CppunitTest_sc_tablesheetobj.mk index 067ed9eea0ef..efa20b605833 100644 --- a/sc/CppunitTest_sc_tablesheetobj.mk +++ b/sc/CppunitTest_sc_tablesheetobj.mk @@ -34,6 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_spreadsheetobj, \ sc/qa/extras/sctablesheetobj \ )) +$(eval $(call gb_CppunitTest_use_external,sc_spreadsheetobj,boost_headers)) + $(eval $(call gb_CppunitTest_use_libraries,sc_spreadsheetobj, \ avmedia \ basegfx \ diff --git a/sc/CppunitTest_sc_tablesheetsobj.mk b/sc/CppunitTest_sc_tablesheetsobj.mk index 60cb6f1ea73d..2244f13b8aea 100644 --- a/sc/CppunitTest_sc_tablesheetsobj.mk +++ b/sc/CppunitTest_sc_tablesheetsobj.mk @@ -34,6 +34,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_spreadsheetsobj, \ sc/qa/extras/sctablesheetsobj \ )) +$(eval $(call gb_CppunitTest_use_external,sc_spreadsheetsobj,boost_headers)) + $(eval $(call gb_CppunitTest_use_libraries,sc_spreadsheetsobj, \ avmedia \ basegfx \ diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk index 28bf1bc4c310..762e35798049 100644 --- a/sc/CppunitTest_sc_ucalc.mk +++ b/sc/CppunitTest_sc_ucalc.mk @@ -37,13 +37,13 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_ucalc, \ $(eval $(call gb_CppunitTest_use_library_objects,sc_ucalc,sc)) -$(eval $(call gb_CppunitTest_use_external,sc_ucalc,mdds_headers)) - ifeq ($(ENABLE_TELEPATHY),TRUE) $(eval $(call gb_CppunitTest_use_libraries,sc_ucalc,tubes)) endif $(eval $(call gb_CppunitTest_use_externals,sc_ucalc,\ + boost_headers \ + mdds_headers \ orcus \ )) diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index e83d11057cf5..865f5f0c3e6e 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -49,6 +49,7 @@ $(eval $(call gb_Library_use_packages,sc,\ $(eval $(call gb_Library_use_sdk_api,sc)) $(eval $(call gb_Library_use_externals,sc,\ + boost_headers \ mdds_headers \ )) diff --git a/sc/Library_scd.mk b/sc/Library_scd.mk index 25e2a6e1badf..815ce7d26d70 100644 --- a/sc/Library_scd.mk +++ b/sc/Library_scd.mk @@ -29,6 +29,8 @@ $(eval $(call gb_Library_set_include,scd,\ $$(INCLUDE) \ )) +$(eval $(call gb_Library_use_external,scd,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,scd)) $(eval $(call gb_Library_use_libraries,scd,\ diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk index 39010911eeb6..72910ecdabbb 100644 --- a/sc/Library_scfilt.mk +++ b/sc/Library_scfilt.mk @@ -34,7 +34,10 @@ $(eval $(call gb_Library_set_include,scfilt,\ $(eval $(call gb_Library_use_sdk_api,scfilt)) -$(eval $(call gb_Library_use_external,scfilt,mdds_headers)) +$(eval $(call gb_Library_use_externals,scfilt,\ + boost_headers \ + mdds_headers \ +)) $(eval $(call gb_Library_use_libraries,scfilt,\ basegfx \ diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk index b1eb7720f247..4db5d8142749 100644 --- a/sc/Library_scui.mk +++ b/sc/Library_scui.mk @@ -33,7 +33,10 @@ $(eval $(call gb_Library_set_include,scui,\ $(eval $(call gb_Library_use_sdk_api,scui)) -$(eval $(call gb_Library_use_external,scui,mdds_headers)) +$(eval $(call gb_Library_use_externals,scui,\ + boost_headers \ + mdds_headers \ +)) $(eval $(call gb_Library_use_libraries,scui,\ comphelper \ diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk index 6272d2238220..42c76b3d3e1e 100644 --- a/sc/Library_vbaobj.mk +++ b/sc/Library_vbaobj.mk @@ -32,6 +32,8 @@ $(eval $(call gb_Library_set_include,vbaobj,\ $(eval $(call gb_Library_set_componentfile,vbaobj,sc/util/vbaobj)) +$(eval $(call gb_Library_use_external,vbaobj,boost_headers)) + $(eval $(call gb_Library_use_api,vbaobj,\ offapi \ oovbaapi \ |