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 /sal | |
| 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 'sal')
| -rw-r--r-- | sal/CppunitTest_sal_checkapi.mk | 2 | ||||
| -rw-r--r-- | sal/CppunitTest_sal_osl_file.mk | 2 | ||||
| -rw-r--r-- | sal/CppunitTest_sal_osl_setthreadname.mk | 2 | ||||
| -rw-r--r-- | sal/Executable_cppunittester.mk | 5 | ||||
| -rw-r--r-- | sal/Library_sal_textenc.mk | 2 |
5 files changed, 12 insertions, 1 deletions
diff --git a/sal/CppunitTest_sal_checkapi.mk b/sal/CppunitTest_sal_checkapi.mk index 06e42a997987..b21f1ecbd974 100644 --- a/sal/CppunitTest_sal_checkapi.mk +++ b/sal/CppunitTest_sal_checkapi.mk @@ -36,6 +36,8 @@ $(eval $(call gb_CppunitTest_set_include,sal_checkapi,\ -I$(SRCDIR)/sal/inc \ )) +$(eval $(call gb_CppunitTest_use_external,sal_checkapi,boost_headers)) + # strings.cxx includes generated strings.hxx $(call gb_CxxObject_get_target,sal/qa/checkapi/strings) : \ INCLUDE += -I$(call gb_CustomTarget_get_workdir,sal/allheaders) diff --git a/sal/CppunitTest_sal_osl_file.mk b/sal/CppunitTest_sal_osl_file.mk index 9b70af7e1e34..1010f4a8a94c 100644 --- a/sal/CppunitTest_sal_osl_file.mk +++ b/sal/CppunitTest_sal_osl_file.mk @@ -31,6 +31,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_file,\ sal/qa/osl/file/osl_File \ )) +$(eval $(call gb_CppunitTest_use_external,sal_osl_file,boost_headers)) + $(eval $(call gb_CppunitTest_use_libraries,sal_osl_file,\ sal \ $(gb_UWINAPI) \ diff --git a/sal/CppunitTest_sal_osl_setthreadname.mk b/sal/CppunitTest_sal_osl_setthreadname.mk index b0c055f34227..88ff01775efd 100644 --- a/sal/CppunitTest_sal_osl_setthreadname.mk +++ b/sal/CppunitTest_sal_osl_setthreadname.mk @@ -32,6 +32,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_setthreadname, \ sal/qa/osl/setthreadname/test-setthreadname \ )) +$(eval $(call gb_CppunitTest_use_external,sal_osl_setthreadname,boost_headers)) + $(eval $(call gb_CppunitTest_use_libraries,sal_osl_setthreadname, \ sal \ $(gb_UWINAPI) \ diff --git a/sal/Executable_cppunittester.mk b/sal/Executable_cppunittester.mk index b5826942378f..40a399b21f77 100644 --- a/sal/Executable_cppunittester.mk +++ b/sal/Executable_cppunittester.mk @@ -37,7 +37,10 @@ $(eval $(call gb_Executable_use_libraries,cppunit/cppunittester,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_use_external,cppunit/cppunittester,cppunit)) +$(eval $(call gb_Executable_use_externals,cppunit/cppunittester,\ + boost_headers \ + cppunit \ +)) $(eval $(call gb_Executable_add_exception_objects,cppunit/cppunittester,\ sal/cppunittester/cppunittester \ diff --git a/sal/Library_sal_textenc.mk b/sal/Library_sal_textenc.mk index 972f0ee5d405..27e6660a0cb8 100644 --- a/sal/Library_sal_textenc.mk +++ b/sal/Library_sal_textenc.mk @@ -27,6 +27,8 @@ $(eval $(call gb_Library_Library,sal_textenc)) +$(eval $(call gb_Library_use_external,sal_textenc,boost_headers)) + $(eval $(call gb_Library_use_libraries,sal_textenc,\ sal \ $(gb_UWINAPI) \ |