[MOAB-dev] r5747 - MOAB/trunk/tools/vtkMOABReader

[obara at mcs.anl.gov]

Author: obara
Date: 2012-09-23 19:27:43 -0500 (Sun, 23 Sep 2012)
New Revision: 5747

Added:
   MOAB/trunk/tools/vtkMOABReader/TestMOABModelReader.cxx
Modified:
   MOAB/trunk/tools/vtkMOABReader/CMakeLists.txt.in
   MOAB/trunk/tools/vtkMOABReader/vtkMOABReader.cxx
   MOAB/trunk/tools/vtkMOABReader/vtkMOABReader.h
Log:
Adding an updated version of the vtkMOABReader and an additional test

Modified: MOAB/trunk/tools/vtkMOABReader/CMakeLists.txt.in
===================================================================
--- MOAB/trunk/tools/vtkMOABReader/CMakeLists.txt.in	2012-09-21 17:40:02 UTC (rev 5746)
+++ MOAB/trunk/tools/vtkMOABReader/CMakeLists.txt.in	2012-09-24 00:27:43 UTC (rev 5747)
@@ -1,3 +1,4 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.2 FATAL_ERROR)
 SET(MOAB_DIR "@abs_builddir@/../.." CACHE PATH "MOAB base directory")
 if (MOAB_DIR)
   INCLUDE_DIRECTORIES(${MOAB_DIR}/include @srcdir@)
@@ -3,10 +4,46 @@
   LINK_DIRECTORIES(${MOAB_DIR}/lib)
   LINK_LIBRARIES(MOAB)
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6.3)
-FIND_PACKAGE(ParaView REQUIRED)
-INCLUDE(${PARAVIEW_USE_FILE})
- ADD_PARAVIEW_PLUGIN(vtkMOABReader "4.0" 
-   SERVER_MANAGER_XML @srcdir@/vtkMOABReader.xml
-   SERVER_MANAGER_SOURCES @srcdir@/vtkMOABReader.cxx 
-   GUI_RESOURCE_FILES @srcdir@/vtkMOABReaderGUI.xml)
+
+  FIND_PACKAGE (ParaView REQUIRED)
+  IF(ParaView_FOUND)
+    include (${PARAVIEW_USE_FILE})
+  ELSE(ParaView_FOUND)
+    message(FATAL_ERROR "Please set the path to ParaView build")
+  ENDIF(ParaView_FOUND)
+  
+  if(APPLE)
+    ADD_EXECUTABLE(TestMOABModelReader MACOSX_BUNDLE
+      TestMOABModelReader.cxx
+      vtkMOABReader.cxx)
+  else(APPLE)
+    ADD_EXECUTABLE(TestMOABModelReader
+      TestMOABModelReader.cxx
+      vtkMOABReader.cxx)
+  endif(APPLE)
+  
+  if(VTK_LIBRARIES)
+    SET(VTK_LIBS ${VTK_LIBRARIES})
+  else(VTK_LIBRARIES)
+    SET(VTK_LIBS
+      vtkHybrid
+      vtkRendering)
+  endif(VTK_LIBRARIES)
+
+  ADD_PARAVIEW_PLUGIN(vtkMOABReader "4.0" 
+    SERVER_MANAGER_XML @srcdir@/vtkMOABReader.xml
+    SERVER_MANAGER_SOURCES @srcdir@/vtkMOABReader.cxx 
+    GUI_RESOURCE_FILES @srcdir@/vtkMOABReaderGUI.xml)
+  
+  FIND_LIBRARY(MOAB_LIBRARY MOAB)