[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/CppunitTest_sc_opencl_test.mk

[Andrzej J.R. Hunt]

 sc/CppunitTest_sc_opencl_test.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f43e3ec83f745e657a8a5db66015967bdd8912da
Author: Andrzej J.R. Hunt <andrzej at ahunt.org>
Date:   Sun Dec 1 12:10:20 2013 +0000

    OCppunitTest_sc_opencl_test: only depend on scopencl if ENABLE_OPENCL.
    
    scopencl is only built when ENABLE_OPENCL is true, but the unit test
    should still run successfully using the fallback mechanism without
    scopencl (i.e. when --disable-opencl is used).
    
    Change-Id: I4b44148f1f59ad8b3d9c78c2fd0e1cbe2030db37
    (cherry picked from commit 5aa37dd9eb9b6f44c2a91f0e41bae42754ba733b)

diff --git a/sc/CppunitTest_sc_opencl_test.mk b/sc/CppunitTest_sc_opencl_test.mk
index d808e44..ef5792c 100644
--- a/sc/CppunitTest_sc_opencl_test.mk
+++ b/sc/CppunitTest_sc_opencl_test.mk
@@ -37,7 +37,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_opencl_test, \
     salhelper \
     sax \
     sc \
-    scopencl \
+    $(if $(ENABLE_OPENCL),scopencl) \
     scqahelper \
     sfx \
     sot \