summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-12-08 09:29:28 +0200
committerDavid Tardon <dtardon@redhat.com>2014-12-08 09:07:27 +0000
commitbf6544c0ab0625e5ce5918f6d861763d4fa87aba (patch)
tree36ab0c865a41eee381cf165c7bff0b2d09136375 /cui
parent4517c94000153eab6c034ea548698953dd93f794 (diff)
Don't treat clew as part of an "external" clcc module
There is no obvious authoritative upstream for clew anyway, so it causes philosophical problems for distros. For a while, we used to use a zip archive from the "clcc" project on SourceForge that included clew.c and clew.h. (Before that we also just had clew.c and clew.h in our source repo.) So, drop the external/clcc module and have clew.c and clew.h in the source repo again. But this time clew is in a module of its own, not in sc. This re-introduces "No need to have OpenCL optional at configure-time" This reverts commit 764836cb00e8e6dfd2ab48e080a166ec90359e01. Change-Id: I413142f4f9f8399489f9c3e5327132822f07a454 Reviewed-on: https://gerrit.libreoffice.org/13368 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'cui')
-rw-r--r--cui/Library_cui.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index b564e4d32012..6df06f996b3b 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -34,6 +34,8 @@ $(eval $(call gb_Library_use_sdk_api,cui))
$(eval $(call gb_Library_use_libraries,cui,\
$(call gb_Helper_optional,AVMEDIA,avmedia) \
basegfx \
+ $(call gb_Helper_optional,OPENCL,\
+ clew) \
comphelper \
cppu \
cppuhelper \
@@ -66,8 +68,6 @@ $(eval $(call gb_Library_use_libraries,cui,\
$(eval $(call gb_Library_use_externals,cui,\
boost_headers \
- $(call gb_Helper_optional,OPENCL,\
- clew) \
icuuc \
icu_headers \
))