diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-12 20:06:04 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-12 20:54:28 +0000 |
| commit | ec53ac63e342d9d00e1aed4372a903630b6a191b (patch) | |
| tree | 553abe8fb666e609b60a97fbcd5c3edaed348d9b /sc | |
| parent | f18d1d7be8085d82a013a34ed6d1cb2253d7721c (diff) | |
Move clew/clew.h into external, too
For consistency with what 38cd1d9a5f00dc69ba0d60e2fe6957090c7a26d1 "clew: move
this foreign code to external/clew" did for clew.c. Library_scfilt depends on
clew/clew.h, simply make it depend on the full clew external.
Change-Id: Idcbf56a69084e108832c8970507ebea0f7ff400b
Reviewed-on: https://gerrit.libreoffice.org/24035
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/CppunitTest_sc_opencl_test.mk | 2 | ||||
| -rw-r--r-- | sc/CppunitTest_sc_ucalc.mk | 4 | ||||
| -rw-r--r-- | sc/Library_sc.mk | 4 | ||||
| -rw-r--r-- | sc/Library_scfilt.mk | 1 | ||||
| -rw-r--r-- | sc/Library_scui.mk | 4 |
5 files changed, 8 insertions, 7 deletions
diff --git a/sc/CppunitTest_sc_opencl_test.mk b/sc/CppunitTest_sc_opencl_test.mk index ea93111e2e4e..60ab72bd896b 100644 --- a/sc/CppunitTest_sc_opencl_test.mk +++ b/sc/CppunitTest_sc_opencl_test.mk @@ -15,12 +15,12 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_opencl_test, \ $(eval $(call gb_CppunitTest_use_externals,sc_opencl_test, \ boost_headers \ + $(call gb_Helper_optional,OPENCL,clew) \ mdds_headers \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_opencl_test, \ basegfx \ - $(call gb_Helper_optional,OPENCL,clew) \ comphelper \ cppu \ cppuhelper \ diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk index cbdf4fd9a620..51ac410996fa 100644 --- a/sc/CppunitTest_sc_ucalc.mk +++ b/sc/CppunitTest_sc_ucalc.mk @@ -32,6 +32,8 @@ endif $(eval $(call gb_CppunitTest_use_externals,sc_ucalc,\ boost_headers \ + $(call gb_Helper_optional,OPENCL, \ + clew) \ icu_headers \ icui18n \ icuuc \ @@ -44,8 +46,6 @@ $(eval $(call gb_CppunitTest_use_externals,sc_ucalc,\ $(eval $(call gb_CppunitTest_use_libraries,sc_ucalc, \ $(call gb_Helper_optional,AVMEDIA,avmedia) \ basegfx \ - $(call gb_Helper_optional,OPENCL, \ - clew) \ comphelper \ cppu \ cppuhelper \ diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index ff91a9f822ed..bd767cb31c30 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -37,6 +37,8 @@ $(eval $(call gb_Library_use_sdk_api,sc)) $(eval $(call gb_Library_use_externals,sc,\ boost_headers \ + $(call gb_Helper_optional,OPENCL, \ + clew) \ icu_headers \ icui18n \ icuuc \ @@ -62,8 +64,6 @@ endif $(eval $(call gb_Library_use_libraries,sc,\ $(call gb_Helper_optional,AVMEDIA,avmedia) \ basegfx \ - $(call gb_Helper_optional,OPENCL, \ - clew) \ comphelper \ cppu \ cppuhelper \ diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk index b76429027089..625da79bf2a9 100644 --- a/sc/Library_scfilt.mk +++ b/sc/Library_scfilt.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Library_use_custom_headers,scfilt,\ $(eval $(call gb_Library_use_externals,scfilt,\ boost_headers \ + $(call gb_Helper_optional,OPENCL,clew) \ mdds_headers \ )) diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk index fa9d6ea6796e..e694885aa13b 100644 --- a/sc/Library_scui.mk +++ b/sc/Library_scui.mk @@ -24,12 +24,12 @@ $(eval $(call gb_Library_use_sdk_api,scui)) $(eval $(call gb_Library_use_externals,scui,\ boost_headers \ + $(call gb_Helper_optional,OPENCL, \ + clew) \ mdds_headers \ )) $(eval $(call gb_Library_use_libraries,scui,\ - $(call gb_Helper_optional,OPENCL, \ - clew) \ comphelper \ cppu \ cppuhelper \ |