diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-12-08 09:29:28 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-12-08 09:07:27 +0000 |
| commit | bf6544c0ab0625e5ce5918f6d861763d4fa87aba (patch) | |
| tree | 36ab0c865a41eee381cf165c7bff0b2d09136375 /opencl | |
| parent | 4517c94000153eab6c034ea548698953dd93f794 (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 'opencl')
| -rw-r--r-- | opencl/Library_opencl.mk | 2 | ||||
| -rw-r--r-- | opencl/inc/opencl_device_selection.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/opencl/Library_opencl.mk b/opencl/Library_opencl.mk index eb832208b654..edc6adda2e04 100644 --- a/opencl/Library_opencl.mk +++ b/opencl/Library_opencl.mk @@ -20,7 +20,6 @@ $(eval $(call gb_Library_add_defs,opencl,\ $(eval $(call gb_Library_use_externals,opencl,\ boost_headers \ - clew \ icu_headers \ icui18n \ icuuc \ @@ -33,6 +32,7 @@ $(eval $(call gb_Library_use_custom_headers,opencl,\ $(eval $(call gb_Library_use_sdk_api,opencl)) $(eval $(call gb_Library_use_libraries,opencl,\ + clew \ configmgr \ comphelper \ cppu \ diff --git a/opencl/inc/opencl_device_selection.h b/opencl/inc/opencl_device_selection.h index 03373f4a3d0f..f40aa8b192dd 100644 --- a/opencl/inc/opencl_device_selection.h +++ b/opencl/inc/opencl_device_selection.h @@ -17,7 +17,8 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> -#include <clew.h> + +#include <clew/clew.h> #define DS_DEVICE_NAME_LENGTH 256 |