+ check if pcl is built opennurbs support

FreeCAD · Nov 4, 2015 · 38ca335 · 38ca335
1 parent 6495005
commit 38ca335
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/src/Mod/ReverseEngineering/App/AppReverseEngineering.cpp b/src/Mod/ReverseEngineering/App/AppReverseEngineering.cpp
@@ -61,6 +61,8 @@ class Module : public Py::ExtensionModule<Module>
         add_varargs_method("triangulate",&Module::triangulate,
             "triangulate(PointKernel,searchRadius[,mu=2.5])."
         );
+#endif
+#if defined(HAVE_PCL_OPENNURBS)
         add_keyword_method("fitBSpline",&Module::fitBSpline,
             "fitBSpline(PointKernel)."
         );
@@ -198,6 +200,8 @@ class Module : public Py::ExtensionModule<Module>
 
         return Py::asObject(new Mesh::MeshPy(mesh));
     }
+#endif
+#if defined(HAVE_PCL_OPENNURBS)
     Py::Object fitBSpline(const Py::Tuple& args, const Py::Dict& kwds)
     {
         PyObject *pcObj;

diff --git a/src/Mod/ReverseEngineering/App/BSplineFitting.cpp b/src/Mod/ReverseEngineering/App/BSplineFitting.cpp
@@ -22,7 +22,7 @@
 
 
 #include "PreCompiled.h"
-#if defined(HAVE_PCL_SURFACE)
+#if defined(HAVE_PCL_OPENNURBS)
 #ifndef _PreComp_
 # include <Geom_BSplineSurface.hxx>
 # include <TColgp_Array2OfPnt.hxx>
@@ -236,4 +236,4 @@ Handle(Geom_BSplineSurface) BSplineFitting::perform()
     return Handle_Geom_BSplineSurface();
 #endif
 }
-#endif // HAVE_PCL_SURFACE
+#endif // HAVE_PCL_OPENNURBS
diff --git a/src/Mod/ReverseEngineering/App/BSplineFitting.h b/src/Mod/ReverseEngineering/App/BSplineFitting.h
@@ -24,7 +24,7 @@
 #ifndef REEN_BSPLINEFITTING_H
 #define REEN_BSPLINEFITTING_H
 
-#if defined(HAVE_PCL_SURFACE)
+#if defined(HAVE_PCL_OPENNURBS)
 #include <Handle_Geom_BSplineSurface.hxx>
 #include <Base/Vector3D.h>
 #include <vector>
@@ -58,6 +58,6 @@ class BSplineFitting
 
 }
 
-#endif // HAVE_PCL_SURFACE
+#endif // HAVE_PCL_OPENNURBS
 
 #endif // REEN_BSPLINEFITTING_H
diff --git a/src/Mod/ReverseEngineering/App/CMakeLists.txt b/src/Mod/ReverseEngineering/App/CMakeLists.txt
@@ -6,6 +6,10 @@ endif(MSVC)
 
 if (PCL_SURFACE_FOUND AND PCL_FEATURES_FOUND)
     add_definitions(-DHAVE_PCL_SURFACE)
+
+    if(EXISTS "${PCL_INCLUDE_DIRS}/pcl/surface/on_nurbs/fitting_surface_tdm.h")
+        add_definitions(-DHAVE_PCL_OPENNURBS)
+    endif()
 endif ()
 
 include_directories(