RepositoryExternal.mk | 8 cui/Library_cui.mk | 4 external/clew/Library_clew.mk | 5 external/clew/source/include/clew/clew.h | 1122 +++++++++++++++++++++++++++++++ include/clew/clew.h | 1122 ------------------------------- opencl/Library_opencl.mk | 2 sc/CppunitTest_sc_opencl_test.mk | 2 sc/CppunitTest_sc_ucalc.mk | 4 sc/Library_sc.mk | 4 sc/Library_scfilt.mk | 1 sc/Library_scui.mk | 4 11 files changed, 1146 insertions(+), 1132 deletions(-)
New commits: commit ec53ac63e342d9d00e1aed4372a903630b6a191b Author: Stephan Bergmann <sberg...@redhat.com> Date: Tue Apr 12 20:06:04 2016 +0200 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 <c...@libreoffice.org> Reviewed-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 6a36f9f..713994e 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3968,4 +3968,12 @@ endef endif endif +define gb_LinkTarget__use_clew +$(call gb_LinkTarget_set_include,$(1), \ + -I$(SRCDIR)/external/clew/source/include \ + $$(INCLUDE) \ +) +$(call gb_LinkTarget_use_libraries,$(1),clew) +endef + # vim: set noet sw=4 ts=4: diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index 427e5fa..f835797 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -33,8 +33,6 @@ $(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 \ @@ -67,6 +65,8 @@ $(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 \ )) diff --git a/external/clew/Library_clew.mk b/external/clew/Library_clew.mk index 31ef971..9e664fe 100644 --- a/external/clew/Library_clew.mk +++ b/external/clew/Library_clew.mk @@ -30,6 +30,11 @@ $(eval $(call gb_Library_add_cobjects,clew,\ external/clew/source/clew \ )) +$(eval $(call gb_Library_set_include,clew, \ + -I$(SRCDIR)/external/clew/source/include \ + $$(INCLUDE) \ +)) + # This is required for module-deps.pl to produce correct dependencies. $(eval $(call gb_Library_use_libraries,clew,)) diff --git a/include/clew/clew.h b/external/clew/source/include/clew/clew.h similarity index 100% rename from include/clew/clew.h rename to external/clew/source/include/clew/clew.h diff --git a/opencl/Library_opencl.mk b/opencl/Library_opencl.mk index edc6add..eb83220 100644 --- a/opencl/Library_opencl.mk +++ b/opencl/Library_opencl.mk @@ -20,6 +20,7 @@ $(eval $(call gb_Library_add_defs,opencl,\ $(eval $(call gb_Library_use_externals,opencl,\ boost_headers \ + clew \ icu_headers \ icui18n \ icuuc \ @@ -32,7 +33,6 @@ $(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/sc/CppunitTest_sc_opencl_test.mk b/sc/CppunitTest_sc_opencl_test.mk index ea93111..60ab72b 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 cbdf4fd..51ac410 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 ff91a9f..bd767cb 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 b764290..625da79 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 fa9d6ea..e694885a 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 \ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits