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 /svx | |
| 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 'svx')
| -rw-r--r-- | svx/Executable_gengal.bin.mk | 2 | ||||
| -rw-r--r-- | svx/Library_svx.mk | 1 | ||||
| -rw-r--r-- | svx/Library_svxcore.mk | 5 | ||||
| -rw-r--r-- | svx/Library_textconversiondlgs.mk | 2 |
4 files changed, 9 insertions, 1 deletions
diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk index d830811450c6..10955f9f1bc5 100644 --- a/svx/Executable_gengal.bin.mk +++ b/svx/Executable_gengal.bin.mk @@ -39,6 +39,8 @@ $(eval $(call gb_Executable_add_cxxflags,$(svx_GENGALBIN),\ $$(CXXFLAGS) \ )) +$(eval $(call gb_Executable_use_external,$(svx_GENGALBIN),boost_headers)) + $(eval $(call gb_Executable_use_libraries,$(svx_GENGALBIN),\ sal \ tl \ diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index b331a2636637..169c01c3ca88 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -62,6 +62,7 @@ $(eval $(call gb_Library_use_libraries,svx,\ )) $(eval $(call gb_Library_use_externals,svx,\ + boost_headers \ icuuc \ icu_headers \ )) diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index f59a724cd6dd..918cf389f680 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -78,7 +78,10 @@ $(eval $(call gb_Library_use_libraries,svxcore,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_use_external,svxcore,icuuc)) +$(eval $(call gb_Library_use_externals,svxcore,\ + boost_headers \ + icuuc \ +)) $(eval $(call gb_Library_add_exception_objects,svxcore,\ svx/source/core/coreservices \ diff --git a/svx/Library_textconversiondlgs.mk b/svx/Library_textconversiondlgs.mk index 2a0fdcd4207b..50db32b3af33 100644 --- a/svx/Library_textconversiondlgs.mk +++ b/svx/Library_textconversiondlgs.mk @@ -30,6 +30,8 @@ $(eval $(call gb_Library_set_include,textconversiondlgs,\ $$(INCLUDE) \ )) +$(eval $(call gb_Library_use_external,textconversiondlgs,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,textconversiondlgs)) $(eval $(call gb_Library_use_libraries,textconversiondlgs,\ |