Refs #4606 to avoid OpenCascade dependency

mantidproject · Jan 22, 2012 · da81456 · da81456
1 parent 0e8f47f
commit da81456
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/Code/Mantid/Framework/Geometry/CMakeLists.txt b/Code/Mantid/Framework/Geometry/CMakeLists.txt
@@ -275,6 +275,7 @@ if (NOT NO_OPENCASCADE)
   find_package ( OpenCascade REQUIRED )
   include_directories ( ${OPENCASCADE_INCLUDE_DIR} )
   set (SRC_FILES ${SRC_FILES} ${OPENCASCADE_SRC} )
+  add_definitions ( -DNO_OPENCASCADE )
 endif ()
 
 # A few defines needed for OpenCascade on the Mac

diff --git a/Code/Mantid/Framework/Geometry/src/Rendering/CacheGeometryGenerator.cpp b/Code/Mantid/Framework/Geometry/src/Rendering/CacheGeometryGenerator.cpp
@@ -33,11 +33,13 @@ namespace Mantid
     {
       if(mNoOfVertices<=0) //There are no triangles defined to use OpenCascade handler
       {
-	OCGeometryHandler h(Obj);
-	mNoOfVertices=h.NumberOfPoints();
-	mNoOfTriangles=h.NumberOfTriangles();
-	mPoints=h.getTriangleVertices();
-	mFaces=h.getTriangleFaces();
+#ifndef NO_OPENCASCADE
+        OCGeometryHandler h(Obj);
+        mNoOfVertices=h.NumberOfPoints();
+        mNoOfTriangles=h.NumberOfTriangles();
+        mPoints=h.getTriangleVertices();
+        mFaces=h.getTriangleFaces();
+#endif
       }
     }