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 /smoketest | |
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 'smoketest')
-rw-r--r-- | smoketest/CppunitTest_smoketest.mk | 2 | ||||
-rw-r--r-- | smoketest/Library_smoketest.mk | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/smoketest/CppunitTest_smoketest.mk b/smoketest/CppunitTest_smoketest.mk index b99c160dc844..ee0d8156c791 100644 --- a/smoketest/CppunitTest_smoketest.mk +++ b/smoketest/CppunitTest_smoketest.mk @@ -33,6 +33,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,smoketest,\ smoketest/smoketest_too \ )) +$(eval $(call gb_CppunitTest_use_external,smoketest,boost_headers)) + $(eval $(call gb_CppunitTest_use_api,smoketest,\ offapi \ udkapi \ diff --git a/smoketest/Library_smoketest.mk b/smoketest/Library_smoketest.mk index 5832bd471e0c..17d0d9b7562d 100644 --- a/smoketest/Library_smoketest.mk +++ b/smoketest/Library_smoketest.mk @@ -42,7 +42,10 @@ $(eval $(call gb_Library_use_libraries,smoketest,\ unotest \ )) -$(eval $(call gb_Library_use_external,smoketest,cppunit)) +$(eval $(call gb_Library_use_externals,smoketest,\ + boost_headers \ + cppunit \ +)) $(eval $(call gb_Library_add_exception_objects,smoketest,\ smoketest/smoketest \ |