...
 
Commits (2)
......@@ -13,7 +13,7 @@ set (ConceptualModelBuilder_SOURCE_DIR @ConceptualModelBuilder_SOURCE_DIR@)
set (ParaView_DIR "@ParaView_DIR@")
set (SMTK_ROOT_DIR "@SMTK_ROOT_DIR@")
set (SMTK_INCLUDE_DIR "@SMTK_INCLUDE_DIR@")
set (PV_INSTALL_PLUGIN_DIR "@PV_INSTALL_PLUGIN_DIR@")
set (PARAVIEW_INSTALL_PLUGINS_DIR "@PARAVIEW_INSTALL_PLUGINS_DIR@")
#------------------------------------------------------------------------------
# Setup the cmake search paths
......@@ -66,5 +66,5 @@ include(${SMTK_ROOT_DIR}/lib/SMTK-targets.cmake)
#helper function to install plugins
function(cmb_install_plugin target)
install(TARGETS ${target} DESTINATION ${PV_INSTALL_PLUGIN_DIR} )
install(TARGETS ${target} DESTINATION ${PARAVIEW_INSTALL_PLUGINS_DIR} )
endfunction()
......@@ -29,11 +29,11 @@ if(NOT VTK_INSTALL_EXPORT_NAME)
set(VTK_INSTALL_EXPORT_NAME CMBTargets)
endif()
if(NOT PV_INSTALL_PLUGIN_DIR)
if(NOT PARAVIEW_INSTALL_PLUGINS_DIR)
if(WIN32)
set (PV_INSTALL_PLUGIN_DIR ${VTK_INSTALL_RUNTIME_DIR})
set (PARAVIEW_INSTALL_PLUGINS_DIR ${VTK_INSTALL_RUNTIME_DIR})
else ()
set (PV_INSTALL_PLUGIN_DIR ${VTK_INSTALL_LIBRARY_DIR})
set (PARAVIEW_INSTALL_PLUGINS_DIR ${VTK_INSTALL_LIBRARY_DIR})
endif()
endif()
......@@ -114,7 +114,7 @@ if (APPLE)
CACHE PATH
"Location where the *.app bundle must be installed.")
set(CMAKE_INSTALL_NAME_DIR "@executable_path/../Libraries")
set(PV_INSTALL_PLUGIN_DIR "Plugins")
set(PARAVIEW_INSTALL_PLUGINS_DIR "Plugins")
endif()
#helper function to install plugins
......@@ -134,6 +134,6 @@ function(cmb_install_plugin target)
)
endforeach()
else()
install(TARGETS ${target} DESTINATION ${PV_INSTALL_PLUGIN_DIR} )
install(TARGETS ${target} DESTINATION ${PARAVIEW_INSTALL_PLUGINS_DIR} )
endif()
endfunction()
......@@ -13,5 +13,5 @@ vtk_module(vtkCMBFiltering
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingFreeType
vtksys
EXCLUDE_FROM_WRAP_HIERARCHY
EXCLUDE_FROM_PYTHON_WRAPPING
)
......@@ -9,5 +9,5 @@ vtk_module(vtkCMBGeneral
vtkRenderingFreeType
vtkRendering${VTK_RENDERING_BACKEND}
vtksys
EXCLUDE_FROM_WRAP_HIERARCHY
EXCLUDE_FROM_PYTHON_WRAPPING
)
......@@ -14,6 +14,7 @@
#ifndef __vtkCMBArcEndNode_h
#define __vtkCMBArcEndNode_h
#ifndef __VTK_WRAP__
#include "cmbSystemConfig.h"
#include "vtkABI.h"
......@@ -61,4 +62,5 @@ private:
static vtkIdType NextId;
};
#endif // __VTK_WRAP__
#endif
......@@ -7,5 +7,5 @@ vtk_module(vtkCMBGraphics
vtkFiltersFlowPaths
vtkSMTKMeshingExt
vtksys
EXCLUDE_FROM_WRAP_HIERARCHY
EXCLUDE_FROM_PYTHON_WRAPPING
)
......@@ -11,6 +11,7 @@
#include "vtkCompositeDataIterator.h"
#include "vtkCompositeDataSet.h"
#include "vtkGeometryRepresentationInternal.h"
#include "vtkImageData.h"
#include "vtkImageTextureCrop.h"
#include "vtkInformation.h"
......
......@@ -15,5 +15,5 @@ vtk_module(vtkCMBIO
vtkPVVTKExtensionsDefault
vtkSMTKMeshingExt
vtksys
EXCLUDE_FROM_WRAP_HIERARCHY
EXCLUDE_FROM_PYTHON_WRAPPING
)
......@@ -5,5 +5,5 @@ vtk_module(vtkCMBMeshing
vtkFiltersGeneral
vtkFiltersGeometry
vtksys
EXCLUDE_FROM_WRAP_HIERARCHY
EXCLUDE_FROM_PYTHON_WRAPPING
)
Subproject commit 036a9173c600fe9fd96e658f9a3620cceafcab7f
Subproject commit 326183b5c5abef07b1060591e9f444057f2cf9cd