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 /basic | |
| parent | 20773c2bb04631d9bfd60167ed091752f0deecee (diff) | |
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 'basic')
| -rw-r--r-- | basic/CppunitTest_basic_coverage.mk | 2 | ||||
| -rw-r--r-- | basic/CppunitTest_basic_enable.mk | 2 | ||||
| -rw-r--r-- | basic/CppunitTest_basic_nested_struct.mk | 2 | ||||
| -rw-r--r-- | basic/Library_sb.mk | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/basic/CppunitTest_basic_coverage.mk b/basic/CppunitTest_basic_coverage.mk index 1d337b5f90a1..99aec22b98d2 100644 --- a/basic/CppunitTest_basic_coverage.mk +++ b/basic/CppunitTest_basic_coverage.mk @@ -8,6 +8,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,basic_coverage)) +$(eval $(call gb_CppunitTest_use_external,basic_coverage,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,basic_coverage, \ basic/qa/cppunit/basic_coverage \ )) diff --git a/basic/CppunitTest_basic_enable.mk b/basic/CppunitTest_basic_enable.mk index 7a1c3da5a8cf..1e3f6195bda1 100644 --- a/basic/CppunitTest_basic_enable.mk +++ b/basic/CppunitTest_basic_enable.mk @@ -8,6 +8,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,basic_enable)) +$(eval $(call gb_CppunitTest_use_external,basic_enable,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,basic_enable, \ basic/qa/cppunit/test_append \ )) diff --git a/basic/CppunitTest_basic_nested_struct.mk b/basic/CppunitTest_basic_nested_struct.mk index f7db5a1d1d5e..fcb4583d5a4c 100644 --- a/basic/CppunitTest_basic_nested_struct.mk +++ b/basic/CppunitTest_basic_nested_struct.mk @@ -9,6 +9,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,basic_nested_struct)) +$(eval $(call gb_CppunitTest_use_external,basic_nested_struct,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,basic_nested_struct, \ basic/qa/cppunit/test_nested_struct \ )) diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk index 8597b21de439..8412735d6d89 100644 --- a/basic/Library_sb.mk +++ b/basic/Library_sb.mk @@ -29,6 +29,8 @@ $(eval $(call gb_Library_set_include,sb,\ -I$(SRCDIR)/basic/source/inc \ )) +$(eval $(call gb_Library_use_external,sb,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,sb)) $(eval $(call gb_Library_use_api,sb,oovbaapi)) |