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 /sw | |
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 'sw')
-rw-r--r-- | sw/CppunitTest_sw_filters_test.mk | 3 | ||||
-rw-r--r-- | sw/CppunitTest_sw_macros_test.mk | 2 | ||||
-rw-r--r-- | sw/CppunitTest_sw_subsequent_odfexport.mk | 1 | ||||
-rw-r--r-- | sw/CppunitTest_sw_subsequent_odfimport.mk | 1 | ||||
-rw-r--r-- | sw/CppunitTest_sw_subsequent_ooxmlexport.mk | 1 | ||||
-rw-r--r-- | sw/CppunitTest_sw_subsequent_ooxmlimport.mk | 1 | ||||
-rw-r--r-- | sw/CppunitTest_sw_subsequent_rtfexport.mk | 1 | ||||
-rw-r--r-- | sw/CppunitTest_sw_subsequent_rtfimport.mk | 1 | ||||
-rw-r--r-- | sw/CppunitTest_sw_subsequent_ww8export.mk | 1 | ||||
-rw-r--r-- | sw/CppunitTest_sw_subsequent_ww8import.mk | 1 | ||||
-rw-r--r-- | sw/CppunitTest_sw_swdoc_test.mk | 1 | ||||
-rw-r--r-- | sw/Library_msword.mk | 1 | ||||
-rw-r--r-- | sw/Library_sw.mk | 1 | ||||
-rw-r--r-- | sw/Library_swd.mk | 2 | ||||
-rw-r--r-- | sw/Library_swui.mk | 2 | ||||
-rw-r--r-- | sw/Library_vbaswobj.mk | 1 |
16 files changed, 20 insertions, 1 deletions
diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk index af0936331f80..23e8e752810d 100644 --- a/sw/CppunitTest_sw_filters_test.mk +++ b/sw/CppunitTest_sw_filters_test.mk @@ -29,7 +29,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,sw_filters_test)) -$(eval $(call gb_CppunitTest_use_externals,sw_filters_test, +$(eval $(call gb_CppunitTest_use_externals,sw_filters_test,\ + boost_headers \ libxml2 \ )) diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk index a321a29935e2..c42174c655d4 100644 --- a/sw/CppunitTest_sw_macros_test.mk +++ b/sw/CppunitTest_sw_macros_test.mk @@ -29,6 +29,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,sw_macros_test)) +$(eval $(call gb_CppunitTest_use_external,sw_macros_test,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,sw_macros_test, \ sw/qa/core/macros-test \ )) diff --git a/sw/CppunitTest_sw_subsequent_odfexport.mk b/sw/CppunitTest_sw_subsequent_odfexport.mk index 604db89a3d9f..14ebcf18130b 100644 --- a/sw/CppunitTest_sw_subsequent_odfexport.mk +++ b/sw/CppunitTest_sw_subsequent_odfexport.mk @@ -49,6 +49,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odfexport, \ )) $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_odfexport,\ + boost_headers \ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_odfimport.mk b/sw/CppunitTest_sw_subsequent_odfimport.mk index e634356025d7..5c22725b01ab 100644 --- a/sw/CppunitTest_sw_subsequent_odfimport.mk +++ b/sw/CppunitTest_sw_subsequent_odfimport.mk @@ -48,6 +48,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_odfimport, \ )) $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_odfimport,\ + boost_headers \ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_ooxmlexport.mk b/sw/CppunitTest_sw_subsequent_ooxmlexport.mk index ea355bc96074..868001a04206 100644 --- a/sw/CppunitTest_sw_subsequent_ooxmlexport.mk +++ b/sw/CppunitTest_sw_subsequent_ooxmlexport.mk @@ -49,6 +49,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmlexport, \ )) $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ooxmlexport,\ + boost_headers \ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_ooxmlimport.mk b/sw/CppunitTest_sw_subsequent_ooxmlimport.mk index eefba78146e6..567e8c7ca036 100644 --- a/sw/CppunitTest_sw_subsequent_ooxmlimport.mk +++ b/sw/CppunitTest_sw_subsequent_ooxmlimport.mk @@ -47,6 +47,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ooxmlimport, \ )) $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ooxmlimport,\ + boost_headers \ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_rtfexport.mk b/sw/CppunitTest_sw_subsequent_rtfexport.mk index 9883141845cc..94c94456c8f3 100644 --- a/sw/CppunitTest_sw_subsequent_rtfexport.mk +++ b/sw/CppunitTest_sw_subsequent_rtfexport.mk @@ -48,6 +48,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtfexport, \ )) $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_rtfexport,\ + boost_headers \ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_rtfimport.mk b/sw/CppunitTest_sw_subsequent_rtfimport.mk index 2bcd4296ee7c..88fad7eec5f0 100644 --- a/sw/CppunitTest_sw_subsequent_rtfimport.mk +++ b/sw/CppunitTest_sw_subsequent_rtfimport.mk @@ -50,6 +50,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_rtfimport, \ )) $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_rtfimport,\ + boost_headers \ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_ww8export.mk b/sw/CppunitTest_sw_subsequent_ww8export.mk index ebf6d1334a3d..5575c5058a84 100644 --- a/sw/CppunitTest_sw_subsequent_ww8export.mk +++ b/sw/CppunitTest_sw_subsequent_ww8export.mk @@ -49,6 +49,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8export, \ )) $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ww8export,\ + boost_headers \ libxml2 \ )) diff --git a/sw/CppunitTest_sw_subsequent_ww8import.mk b/sw/CppunitTest_sw_subsequent_ww8import.mk index 39d8e84d7018..cb2031f905f1 100644 --- a/sw/CppunitTest_sw_subsequent_ww8import.mk +++ b/sw/CppunitTest_sw_subsequent_ww8import.mk @@ -46,6 +46,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_subsequent_ww8import, \ )) $(eval $(call gb_CppunitTest_use_externals,sw_subsequent_ww8import,\ + boost_headers \ libxml2 \ )) diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk index 0ca803822503..0be24f3e953a 100644 --- a/sw/CppunitTest_sw_swdoc_test.mk +++ b/sw/CppunitTest_sw_swdoc_test.mk @@ -71,6 +71,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_swdoc_test, \ )) $(eval $(call gb_CppunitTest_use_externals,sw_swdoc_test,\ + boost_headers \ icuuc \ libxml2 \ )) diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk index 23c5e7adc2ff..761800b88bed 100644 --- a/sw/Library_msword.mk +++ b/sw/Library_msword.mk @@ -64,6 +64,7 @@ $(eval $(call gb_Library_use_libraries,msword,\ )) $(eval $(call gb_Library_use_externals,msword,\ + boost_headers \ icuuc \ icu_headers \ libxml2 \ diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index e31e1192f678..264e35a707e4 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -73,6 +73,7 @@ $(eval $(call gb_Library_use_libraries,sw,\ )) $(eval $(call gb_Library_use_externals,sw,\ + boost_headers \ icuuc \ icu_headers \ libxml2 \ diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk index 53a3bbf99b50..477bcea915bc 100644 --- a/sw/Library_swd.mk +++ b/sw/Library_swd.mk @@ -29,6 +29,8 @@ $(eval $(call gb_Library_set_include,swd,\ -I$(SRCDIR)/sw/source/ui/inc \ )) +$(eval $(call gb_Library_use_external,swd,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,swd)) $(eval $(call gb_Library_add_defs,swd,\ diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk index 4a445fd380c0..771ddfac1f6e 100644 --- a/sw/Library_swui.mk +++ b/sw/Library_swui.mk @@ -28,6 +28,8 @@ $(eval $(call gb_Library_set_include,swui,\ $$(INCLUDE) \ )) +$(eval $(call gb_Library_use_external,swui,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,swui)) ifeq ($(SYSTEM_LIBXML),YES) diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk index a02e935b5900..61d273b71305 100644 --- a/sw/Library_vbaswobj.mk +++ b/sw/Library_vbaswobj.mk @@ -58,6 +58,7 @@ $(eval $(call gb_Library_use_libraries,vbaswobj,\ )) $(eval $(call gb_Library_use_externals,vbaswobj,\ + boost_headers \ libxml2 \ )) |