diff options
| -rw-r--r-- | RepositoryExternal.mk | 8 | ||||
| -rw-r--r-- | cui/Library_cui.mk | 4 | ||||
| -rw-r--r-- | external/clew/Library_clew.mk | 5 | ||||
| -rw-r--r-- | external/clew/source/include/clew/clew.h (renamed from include/clew/clew.h) | 0 | ||||
| -rw-r--r-- | opencl/Library_opencl.mk | 2 | ||||
| -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 |
10 files changed, 24 insertions, 10 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 6a36f9f5442d..713994e2a326 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 427e5faf6f09..f835797230f6 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 31ef97170a94..9e664fed5051 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 index f932b341cde2..f932b341cde2 100644 --- a/include/clew/clew.h +++ b/external/clew/source/include/clew/clew.h diff --git a/opencl/Library_opencl.mk b/opencl/Library_opencl.mk index edc6adda2e04..eb832208b654 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 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 \ |