diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-03-09 13:59:35 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-03-21 21:15:44 +0000 |
| commit | 38cd1d9a5f00dc69ba0d60e2fe6957090c7a26d1 (patch) | |
| tree | 853f99a0e3e5c2ab57cb3ff941e0e7c4de3cf8a3 | |
| parent | a79b1192c3241a350115e5a653935bb6986a9099 (diff) | |
clew: move this foreign code to external/clew
... so that hopefully it won't be "cleaned up" and needlessly diverge
from any hypothetical future upstream.
Change-Id: I10503072f618ac6b74bc52d4d59c0d8951bd8d0d
Reviewed-on: https://gerrit.libreoffice.org/23075
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | RepositoryModule_host.mk | 1 | ||||
| -rw-r--r-- | external/Module_external.mk | 1 | ||||
| -rw-r--r-- | external/clew/Library_clew.mk (renamed from clew/Library_clew.mk) | 2 | ||||
| -rw-r--r-- | external/clew/Makefile (renamed from clew/Makefile) | 2 | ||||
| -rw-r--r-- | external/clew/Module_clew.mk (renamed from clew/Module_clew.mk) | 0 | ||||
| -rw-r--r-- | external/clew/README | 5 | ||||
| -rw-r--r-- | external/clew/source/clew.c (renamed from clew/source/clew.c) | 0 |
7 files changed, 8 insertions, 3 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 4b654a29c4af..d2f1d849b7fa 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -34,7 +34,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ bridges \ canvas \ chart2 \ - $(call gb_Helper_optional,OPENCL,clew) \ cli_ure \ $(call gb_Helper_optional,DESKTOP,codemaker) \ comphelper \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 2512b85b2cac..44280e3250ea 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,BZIP2,bzip2) \ $(call gb_Helper_optional,CAIRO,cairo) \ $(call gb_Helper_optional,CDR,libcdr) \ + $(call gb_Helper_optional,OPENCL,clew) \ $(call gb_Helper_optional,CLUCENE,clucene) \ $(call gb_Helper_optional,CMIS,libcmis) \ $(call gb_Helper_optional,COINMP,coinmp) \ diff --git a/clew/Library_clew.mk b/external/clew/Library_clew.mk index 91f4bcedbd06..31ef97170a94 100644 --- a/clew/Library_clew.mk +++ b/external/clew/Library_clew.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Library_add_libs,clew,\ endif $(eval $(call gb_Library_add_cobjects,clew,\ - clew/source/clew \ + external/clew/source/clew \ )) # This is required for module-deps.pl to produce correct dependencies. diff --git a/clew/Makefile b/external/clew/Makefile index ccb1c85a04da..e4968cf85fb6 100644 --- a/clew/Makefile +++ b/external/clew/Makefile @@ -2,6 +2,6 @@ module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) -include $(module_directory)/../solenv/gbuild/partial_build.mk +include $(module_directory)/../../solenv/gbuild/partial_build.mk # vim: set noet sw=4 ts=4: diff --git a/clew/Module_clew.mk b/external/clew/Module_clew.mk index 51f174b78353..51f174b78353 100644 --- a/clew/Module_clew.mk +++ b/external/clew/Module_clew.mk diff --git a/external/clew/README b/external/clew/README new file mode 100644 index 000000000000..7a0d65293534 --- /dev/null +++ b/external/clew/README @@ -0,0 +1,5 @@ +CLEW is the OpenCL Extension Wrangler - similar to GLEW but for OpenCL + +This project doesn't appear to have an obvious upstream, so +the source files are in our git repo and there is no option +to use a system library. diff --git a/clew/source/clew.c b/external/clew/source/clew.c index e885dee9b2d1..e885dee9b2d1 100644 --- a/clew/source/clew.c +++ b/external/clew/source/clew.c |