diff options
| author | David Tardon <dtardon@redhat.com> | 2014-12-07 21:48:55 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-12-08 00:05:30 +0100 |
| commit | 425007a928cefab1e3e867d69ae11b43bb2ab534 (patch) | |
| tree | c81520cb31085c8a928d5a337b0aa417caa3d678 /sc | |
| parent | d03957dd7f92019640fd6a06e2cbef8951f23f4a (diff) | |
Revert "No need to have OpenCL optional at configure-time"
As long as this requires bundling clcc, not allowing to disable it is
unacceptable.
This reverts commit 3b0b76462aa54f60bc9823d9c6ef64e5e35c1208.
Conflicts:
configure.ac
Change-Id: I12b3d5e3325bbd03cd98e1fb5139705d694493c2
(cherry picked from commit 764836cb00e8e6dfd2ab48e080a166ec90359e01)
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/CppunitTest_sc_opencl_test.mk | 2 | ||||
| -rw-r--r-- | sc/Module_sc.mk | 2 | ||||
| -rw-r--r-- | sc/source/ui/optdlg/calcoptionsdlg.hxx | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/sc/CppunitTest_sc_opencl_test.mk b/sc/CppunitTest_sc_opencl_test.mk index 65aedde067dc..76061ad8c0ef 100644 --- a/sc/CppunitTest_sc_opencl_test.mk +++ b/sc/CppunitTest_sc_opencl_test.mk @@ -15,7 +15,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_opencl_test, \ $(eval $(call gb_CppunitTest_use_externals,sc_opencl_test, \ boost_headers \ - clew \ + $(call gb_Helper_optional,OPENCL,clew) \ mdds_headers \ orcus \ orcus-parser \ diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index 9385dc5138bc..3bf84cde51ae 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -54,7 +54,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sc, \ CppunitTest_sc_subsequent_filters_test \ CppunitTest_sc_subsequent_export_test \ CppunitTest_sc_html_export_test \ - CppunitTest_sc_opencl_test \ + $(call gb_Helper_optional,OPENCL,CppunitTest_sc_opencl_test) \ )) # Disabled to allow the check tinderbox execute the sd tests diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx b/sc/source/ui/optdlg/calcoptionsdlg.hxx index c7bfe4dbda29..b56b4c1d827b 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.hxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx @@ -64,8 +64,10 @@ private: OUString toString(sal_Int32 nVal) const; SvTreeListEntry *createItem(const OUString &rCaption, const OUString& sValue) const; void setValueAt(size_t nPos, const OUString &rString); +#if HAVE_FEATURE_OPENCL OpenCLConfig::ImplMatcherSet& CurrentWhiteOrBlackList(); const OpenCLConfig::ImplMatcher& CurrentWhiteOrBlackListEntry(); +#endif private: SvxCheckListBox* mpLbSettings; |