From bf6544c0ab0625e5ce5918f6d861763d4fa87aba Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 8 Dec 2014 09:29:28 +0200 Subject: 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 Tested-by: David Tardon --- cui/Library_cui.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cui') 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 \ )) -- cgit