summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-02-17 11:44:07 +0100
committerStephan Bergmann <sbergman@redhat.com>2013-02-17 11:47:35 +0100
commit4d33da4065bb7620d78f10d04b840f2dd77c6e6e (patch)
tree75ae3b7026b2ebd0dc237db4eb61edcafd6b96bf
parent3f7ead7ffee808f99bf9cf76bbd247af04707242 (diff)
connectivity/kab (indirectly) depends on boost_header
...at least via KDriver.cxx -> tools/diagnose_ex.h -> boost/noncopyable.hpp (kab1) and KStatement.cxx -> KStatement.hxx -> connectivity/sqliterator.hxx -> boost/shared_ptr.hpp (kabdrv1). Becomes evident when building --with-system-boost --with-boost=... on a machine with no system-wide Boost installation. Not sure solving those problems this way is the best approach, though. Change-Id: Ida72362596aaac076efc4e1faab41fa47013975f
-rw-r--r--connectivity/Library_kab1.mk5
-rw-r--r--connectivity/Library_kabdrv1.mk1
2 files changed, 5 insertions, 1 deletions
diff --git a/connectivity/Library_kab1.mk b/connectivity/Library_kab1.mk
index 7fd80cb65b65..e51ab45c018b 100644
--- a/connectivity/Library_kab1.mk
+++ b/connectivity/Library_kab1.mk
@@ -27,7 +27,10 @@
$(eval $(call gb_Library_Library,kab1))
-$(eval $(call gb_Library_use_externals,kab1,kde))
+$(eval $(call gb_Library_use_externals,kab1, \
+ boost_headers \
+ kde \
+))
$(eval $(call gb_Library_set_componentfile,kab1,connectivity/source/drivers/kab/kab1))
diff --git a/connectivity/Library_kabdrv1.mk b/connectivity/Library_kabdrv1.mk
index ecdd90568d98..9050c711acde 100644
--- a/connectivity/Library_kabdrv1.mk
+++ b/connectivity/Library_kabdrv1.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Library_use_packages,kabdrv1,\
$(eval $(call gb_Library_use_sdk_api,kabdrv1))
$(eval $(call gb_Library_use_externals,kabdrv1,\
+ boost_headers \
kde \
))