From a53586f4efe26b8875107d04001f4ecec760c343 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Sat, 26 Jan 2013 21:19:13 +0100 Subject: 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 --- starmath/CppunitTest_starmath_qa_cppunit.mk | 2 ++ starmath/Library_sm.mk | 2 ++ starmath/Library_smd.mk | 2 ++ 3 files changed, 6 insertions(+) (limited to 'starmath') diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk index 7d19bf8073e4..5b2c5a2c0506 100644 --- a/starmath/CppunitTest_starmath_qa_cppunit.mk +++ b/starmath/CppunitTest_starmath_qa_cppunit.mk @@ -32,6 +32,8 @@ $(eval $(call gb_CppunitTest_set_include,starmath_qa_cppunit,\ -I$(SRCDIR)/starmath/inc \ )) +$(eval $(call gb_CppunitTest_use_external,starmath_qa_cppunit,boost_headers)) + $(eval $(call gb_CppunitTest_use_api,starmath_qa_cppunit,\ offapi \ udkapi \ diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk index e9978d606475..c44d12d3a6ea 100644 --- a/starmath/Library_sm.mk +++ b/starmath/Library_sm.mk @@ -32,6 +32,8 @@ $(eval $(call gb_Library_set_include,sm,\ $$(INCLUDE) \ )) +$(eval $(call gb_Library_use_external,sm,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,sm)) $(eval $(call gb_Library_use_libraries,sm,\ diff --git a/starmath/Library_smd.mk b/starmath/Library_smd.mk index 92961c7b01f6..353fc8f99bed 100644 --- a/starmath/Library_smd.mk +++ b/starmath/Library_smd.mk @@ -34,6 +34,8 @@ $(eval $(call gb_Library_set_include,smd,\ $$(INCLUDE) \ )) +$(eval $(call gb_Library_use_external,smd,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,smd)) $(eval $(call gb_Library_use_libraries,smd,\ -- cgit