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 /sd | |
| 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 'sd')
| -rw-r--r-- | sd/CppunitTest_sd_filters_test.mk | 2 | ||||
| -rw-r--r-- | sd/CppunitTest_sd_regression_test.mk | 2 | ||||
| -rw-r--r-- | sd/CppunitTest_sd_uimpress.mk | 1 | ||||
| -rw-r--r-- | sd/Library_sd.mk | 5 | ||||
| -rw-r--r-- | sd/Library_sdd.mk | 2 | ||||
| -rw-r--r-- | sd/Library_sdfilt.mk | 2 | ||||
| -rw-r--r-- | sd/Library_sdui.mk | 2 |
7 files changed, 14 insertions, 2 deletions
diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk index 132980a0be8f..1f3858b50d43 100644 --- a/sd/CppunitTest_sd_filters_test.mk +++ b/sd/CppunitTest_sd_filters_test.mk @@ -29,6 +29,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,sd_filters_test)) +$(eval $(call gb_CppunitTest_use_external,sd_filters_test,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,sd_filters_test, \ sd/qa/unit/filters-test \ )) diff --git a/sd/CppunitTest_sd_regression_test.mk b/sd/CppunitTest_sd_regression_test.mk index 078eff10812d..607c2e398cac 100644 --- a/sd/CppunitTest_sd_regression_test.mk +++ b/sd/CppunitTest_sd_regression_test.mk @@ -29,6 +29,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,sd_regression_test)) +$(eval $(call gb_CppunitTest_use_external,sd_regression_test,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,sd_regression_test, \ sd/qa/unit/regression-test \ )) diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk index 9adef1d401a9..f41a4fb90fe5 100644 --- a/sd/CppunitTest_sd_uimpress.mk +++ b/sd/CppunitTest_sd_uimpress.mk @@ -82,6 +82,7 @@ $(eval $(call gb_CppunitTest_use_system_win32_libs,sd_uimpress,\ endif $(eval $(call gb_CppunitTest_use_externals,sd_uimpress,\ + boost_headers \ gtk \ dbus \ )) diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 19adf059c66d..e2640dd79804 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -109,8 +109,9 @@ $(eval $(call gb_Library_use_libraries,sd,\ )) $(eval $(call gb_Library_use_externals,sd,\ - libxml2 \ - dbus \ + boost_headers \ + libxml2 \ + dbus \ )) ifeq ($(OS),WNT) diff --git a/sd/Library_sdd.mk b/sd/Library_sdd.mk index f0c23cd51c49..7ecba8fcb79c 100644 --- a/sd/Library_sdd.mk +++ b/sd/Library_sdd.mk @@ -32,6 +32,8 @@ $(eval $(call gb_Library_set_include,sdd,\ -I$(SRCDIR)/sd/inc \ )) +$(eval $(call gb_Library_use_external,sdd,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,sdd)) $(eval $(call gb_Library_use_libraries,sdd,\ diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk index 1c4c152bc4b6..5a3dddd58747 100644 --- a/sd/Library_sdfilt.mk +++ b/sd/Library_sdfilt.mk @@ -42,6 +42,8 @@ $(eval $(call gb_Library_add_defs,sdfilt,\ )) endif +$(eval $(call gb_Library_use_external,sdfilt,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,sdfilt)) $(eval $(call gb_Library_use_libraries,sdfilt,\ diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk index e80316f2c82e..601fb2a7077f 100644 --- a/sd/Library_sdui.mk +++ b/sd/Library_sdui.mk @@ -50,6 +50,8 @@ endif endif +$(eval $(call gb_Library_use_external,sdui,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,sdui)) $(eval $(call gb_Library_use_libraries,sdui,\ |