Commit 8b6fb363 authored by Robert Maynard's avatar Robert Maynard

Rename the moab model reader define to make it clearer.

Now that moab is part of smtk, the original define was very unclear.
parent afa4a7c0
......@@ -28,7 +28,7 @@
// Was SMTK built with moab reader? If true, the vtkDiscreteMoabReader
// library will exist and smtkDiscreteSession library will link against it.
#cmakedefine SMTK_ENABLE_MOAB_SUPPORT
#cmakedefine SMTK_ENABLE_MOAB_DISCRETE_READER
// Was SMTK built with CGM? If true, cgm-convert will exist.
#cmakedefine SMTK_ENABLE_CGM_SESSION
......
......@@ -431,7 +431,7 @@ if(SMTK_ENABLE_DISCRETE_SESSION)
endif()
# This option is only available when SMTK_ENABLE_DISCRETE_SESSION is ON
option(SMTK_ENABLE_MOAB_SUPPORT "Build moab reader for discrete model" OFF)
option(SMTK_ENABLE_MOAB_DISCRETE_READER "Build moab reader for discrete model" ${SMTK_USE_SYSTEM_MOAB} )
endif()
################################################################################
......
......@@ -28,7 +28,7 @@ vtk_smtk_setup_module_environment("SMTKDiscrete")
vtk_smtk_process_modules()
# Build vtk moab reader before session
if(SMTK_ENABLE_MOAB_SUPPORT)
if(SMTK_ENABLE_MOAB_DISCRETE_READER)
add_subdirectory(moabreader)
endif()
......@@ -199,7 +199,7 @@ if (VTK_WRAP_PYTHON)
list(APPEND __private_dependencies vtkPythonInterpreter)
endif (VTK_WRAP_PYTHON)
if(SMTK_ENABLE_MOAB_SUPPORT)
if(SMTK_ENABLE_MOAB_DISCRETE_READER)
list(APPEND __private_dependencies vtkDiscreteMoabReader)
endif()
......
......@@ -29,7 +29,7 @@ static const char Session_json[] =
" ,\".2dm (CMB Mesh Files)\""
" ,\".3dm (CMB Mesh Files)\""
" ,\".stl (STL Files)\""
#ifdef SMTK_ENABLE_MOAB_SUPPORT
#ifdef SMTK_ENABLE_MOAB_DISCRETE_READER
" ,\".h5m (Moab Files)\""
" ,\".sat (Moab Files)\""
" ,\".brep (Moab Files)\""
......
......@@ -38,7 +38,7 @@
#include "smtk/bridge/discrete/extension/meshing/vtkCMBTriangleMesher.h"
#endif
#ifdef SMTK_ENABLE_MOAB_SUPPORT
#ifdef SMTK_ENABLE_MOAB_DISCRETE_READER
#include "smtk/bridge/discrete/moabreader/vtkCmbMoabReader.h"
#endif
......@@ -72,7 +72,7 @@ bool ImportOperator::ableToOperate()
std::transform(ext.begin(), ext.end(), ext.begin(), ::tolower);
bool able = (ext == ".vtk" || ext == ".2dm" ||
ext == ".3dm" ||
#ifdef SMTK_ENABLE_MOAB_SUPPORT
#ifdef SMTK_ENABLE_MOAB_DISCRETE_READER
ext == ".h5m" || ext == ".sat" ||
ext == ".brep" || ext == ".stp" ||
ext == ".cub" || ext == ".exo" ||
......@@ -139,7 +139,7 @@ OperatorResult ImportOperator::operateInternal()
ext == ".brep" || ext == ".stp" ||
ext == ".cub" || ext == ".exo" )
{
#ifdef SMTK_ENABLE_MOAB_SUPPORT
#ifdef SMTK_ENABLE_MOAB_DISCRETE_READER
vtkNew<vtkCmbMoabReader> reader;
reader->SetFileName(filename.c_str());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment