Protect lapack dependent functions in java bindings introducing #ifde…

…f VISP_HAVE_LAPACK. Close #519
lagadic · Jan 23, 2019 · e95a4b6 · e95a4b6
1 parent 50d1477
commit e95a4b6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -115,6 +115,7 @@ ViSP 3.2.0 (released January 21, 2019)
     . [#429] vpRobotViper650 getPosition(vpRobot::REFERENCE_FRAME) error
     . [#485] CMake error when PCL is build with VTK option VTK_ENABLE_KITS=ON
     . [#515] Model-based tracking stops throwing an exception: the image of the straight line is a point!
+    . [#519] Cannot build java bindings when lapack is not used
 ----------------------------------------------
 ViSP 3.1.0 (released December 22nd, 2017)
   - Contributors:

diff --git a/modules/java/generator/gen_java.py b/modules/java/generator/gen_java.py
@@ -707,7 +707,7 @@ def gen_func(self, ci, fi, prop_name=''):
             if fi.name in ['detByLUEigen3', 'svdEigen3', 'inverseByLUEigen3', 'pseudoInverseEigen3', 'inverseByEigen3']:
                 c_prologue.append('#if defined(VISP_HAVE_EIGEN3)')
 
-            if fi.name in ['detByLULapack', 'svdLapack', 'inverseByLULapack', 'pseudoInverseLapack', 'inverseByLapack']:
+            if fi.name in ['detByLULapack', 'svdLapack', 'inverseByLULapack', 'pseudoInverseLapack', 'inverseByLapack', 'inverseByCholeskyLapack', 'inverseByQRLapack']:
                 c_prologue.append('#if defined(VISP_HAVE_LAPACK)')
 
             if type_dict[fi.ctype]["jni_type"] == "jdoubleArray" and type_dict[fi.ctype]["suffix"] != "[D":
@@ -999,10 +999,9 @@ def gen_func(self, ci, fi, prop_name=''):
             if fi.name in ['detByLUEigen3', 'svdEigen3', 'inverseByLUEigen3', 'pseudoInverseEigen3', 'inverseByEigen3']:
                 ret += '\n    #endif'
 
-            if fi.name in ['detByLULapack', 'svdLapack', 'inverseByLULapack', 'pseudoInverseLapack', 'inverseByLapack']:
+            if fi.name in ['detByLULapack', 'svdLapack', 'inverseByLULapack', 'pseudoInverseLapack', 'inverseByLapack', 'inverseByCholeskyLapack', 'inverseByQRLapack']:
                 ret += '\n    #endif'
 
-
             rtype = type_dict[fi.ctype].get("jni_type", "jdoubleArray")
             clazz = ci.jname
             cpp_code.write(Template( \