[Libreoffice-commits] core.git: sc/Module_sc.mk

Miklos Vajna vmiklos at collabora.co.uk
Thu Apr 24 23:59:49 PDT 2014


 sc/Module_sc.mk |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 00c19e5def4a62445c85786aef6a507bee6c45fa
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Apr 25 08:57:58 2014 +0200

    sc: add back lost scopencl
    
    Probably removed by accident in
    96475ada3fcf026ae7833824a056b642c1bd1864. Fixes:
    
    /master/solenv/gbuild/Package.mk:35: *** gb_Deliver_deliver: file does
    not exist in instdir, and cannot be delivered:
    /master/instdir/program/libscopencllo.so.  Stop.
    
    Change-Id: Iaee25ac7b21c0f1d5c4ee9eba3b34cff5e65843c

diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 278701c..fae40f5 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -22,6 +22,12 @@ $(eval $(call gb_Module_add_l10n_targets,sc,\
 	UIConfig_scalc \
 ))
 
+ifneq (,$(ENABLE_OPENCL))
+$(eval $(call gb_Module_add_targets,sc,\
+	Library_scopencl \
+))
+endif
+
 ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
 $(eval $(call gb_Module_add_targets,sc,\
 	Library_scqahelper \
@@ -53,6 +59,7 @@ $(eval $(call gb_Module_add_check_targets,sc,\
 $(eval $(call gb_Module_add_slowcheck_targets,sc, \
     CppunitTest_sc_subsequent_filters_test \
     CppunitTest_sc_subsequent_export_test \
+    CppunitTest_sc_opencl_test \
 ))
 
 # Disabled to allow the check tinderbox execute the sd tests


More information about the Libreoffice-commits mailing list