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 /cppu | |
| 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 'cppu')
| -rw-r--r-- | cppu/CppunitTest_cppu_qa_any.mk | 2 | ||||
| -rw-r--r-- | cppu/CppunitTest_cppu_test_cppumaker.mk | 2 | ||||
| -rw-r--r-- | cppu/Library_cppu.mk | 2 | ||||
| -rw-r--r-- | cppu/Library_log_uno.mk | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/cppu/CppunitTest_cppu_qa_any.mk b/cppu/CppunitTest_cppu_qa_any.mk index 0a0342e5162a..6fbd6af6d0cc 100644 --- a/cppu/CppunitTest_cppu_qa_any.mk +++ b/cppu/CppunitTest_cppu_qa_any.mk @@ -31,6 +31,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_any, \ cppu/qa/test_any \ )) +$(eval $(call gb_CppunitTest_use_external,cppu_qa_any,boost_headers)) + $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_any, \ cppu \ sal \ diff --git a/cppu/CppunitTest_cppu_test_cppumaker.mk b/cppu/CppunitTest_cppu_test_cppumaker.mk index f235be8f122a..6a8b1979ac44 100644 --- a/cppu/CppunitTest_cppu_test_cppumaker.mk +++ b/cppu/CppunitTest_cppu_test_cppumaker.mk @@ -31,6 +31,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_test_cppumaker, \ cppu/qa/cppumaker/test_cppumaker \ )) +$(eval $(call gb_CppunitTest_use_external,cppu_test_cppumaker,boost_headers)) + $(eval $(call gb_CppunitTest_use_libraries,cppu_test_cppumaker, \ cppu \ sal \ diff --git a/cppu/Library_cppu.mk b/cppu/Library_cppu.mk index d6dbc58c66ed..4ab71b8f5e7c 100644 --- a/cppu/Library_cppu.mk +++ b/cppu/Library_cppu.mk @@ -37,6 +37,8 @@ $(eval $(call gb_Library_add_defs,cppu,\ -DCPPU_DLLIMPLEMENTATION \ )) +$(eval $(call gb_Library_use_external,cppu,boost_headers)) + $(eval $(call gb_Library_use_libraries,cppu,\ sal \ salhelper \ diff --git a/cppu/Library_log_uno.mk b/cppu/Library_log_uno.mk index e70d16b20fcb..53e92af062f1 100644 --- a/cppu/Library_log_uno.mk +++ b/cppu/Library_log_uno.mk @@ -27,6 +27,8 @@ $(eval $(call gb_Library_Library,log_uno)) +$(eval $(call gb_Library_use_external,log_uno,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,log_uno)) $(eval $(call gb_Library_use_libraries,log_uno,\ |