Commit 98db6239 authored by Utkarsh Ayachit's avatar Utkarsh Ayachit Committed by Kitware Robot
Browse files

Merge topic 'update_vtk_master'

8e0e78b6 Update VTK for build failures in ClientServer wrappings
d95bc678 Use vtkzlib as a module in AnalyzeNIfTIReaderWriter
d65a19de Fix SciberQuestToolKit plugin
cc728aff Fix build issues after udpating VTK to origin/master.
e5983e0f Update VTK to master.
a51b59c9 Merge branch 'hardware-selector-pv-bug' into update_vtk_master
parents d8cbb01f 8e0e78b6
......@@ -98,7 +98,7 @@ vtkSMProperty::~vtkSMProperty()
// through the domain iterator.
void vtkSMProperty::UnRegister(vtkObjectBase* obj)
{
if (this->ReferenceCount.Get() == 2)
if (this->ReferenceCount == 2)
{
this->Superclass::UnRegister(obj);
......
......@@ -260,7 +260,7 @@ void vtkSMNewWidgetRepresentationProxy::UnRegister(vtkObjectBase* obj)
if ( pm && this->Internal )
{
int size = static_cast<int>(this->Internal->Links.size());
if (size > 0 && this->ReferenceCount.Get() == 2 + 2*size)
if (size > 0 && this->ReferenceCount == (2 + 2*size))
{
vtkSMNewWidgetRepresentationInternals* aInternal = this->Internal;
this->Internal = 0;
......
......@@ -21,6 +21,8 @@ vtk_module(vtkPVVTKExtensionsRendering
GROUPS
Qt
ParaViewRendering
PRIVATE_DEPENDS
vtkCommonColor
DEPENDS
vtkChartsCore
vtkFiltersExtraction
......
......@@ -12,10 +12,9 @@ IF (ParaView_SOURCE_DIR)
${MPI_INCLUDE_PATH}
)
# fixme: I am not sure this is needed after modularization.
IF(VTK_USE_SYSTEM_ZLIB)
INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
ENDIF(VTK_USE_SYSTEM_ZLIB)
vtk_module_load(vtkzlib)
INCLUDE_DIRECTORIES(${vtkzlib_INCLUDE_DIRS})
ELSE (ParaView_SOURCE_DIR)
FIND_PACKAGE(ParaView REQUIRED)
......@@ -32,4 +31,4 @@ ADD_PARAVIEW_PLUGIN(AnalyzeNIfTIIO "1.0"
SERVER_MANAGER_XML AnalyzeNIfTISM.xml
REQUIRED_ON_SERVER)
target_link_libraries(AnalyzeNIfTIIO LINK_PRIVATE vtkzlib)
\ No newline at end of file
target_link_libraries(AnalyzeNIfTIIO LINK_PRIVATE ${vtkzlib_LIBRARIES})
......@@ -52,6 +52,10 @@ mark_as_advanced(SQTK_CUDA)
set(SQTK_PYTHON_BINDINGS OFF CACHE BOOL "Enable Python bindings.")
mark_as_advanced(SQTK_PYTHON_BINDINGS)
if (PARAVIEW_USE_UNIFIED_BINDINGS)
set(SQTK_PYTHON_BINDINGS ON CACHE BOOL "Enable Python bindings (needed for unified bindings)." FORCE)
endif ()
if (BUILD_TESTING)
#message(STATUS "SQTK Building regression tests.")
subdirs(Testing)
......@@ -316,6 +320,13 @@ set (SQTK_SM_XML
SciberQuestToolKitSMSources.xml
SciberQuestToolKitSMFilters.xml)
if (SQTK_PYTHON_BINDINGS)
#message(STATUS "SQTK generating vtk python bindings.")
generate_python_bindings(SciberQuestToolKit "${SM_CXX_SOURCES}")
install(TARGETS SciberQuestToolKitPython DESTINATION ${SQTK_LIB_INSTALL_PATH})
install(TARGETS SciberQuestToolKitPythonD DESTINATION ${SQTK_LIB_INSTALL_PATH})
endif()
# Generate the plugin, servermanager and wrapped language bindings.
add_paraview_plugin(
SciberQuestToolKit "${SQTK_VERSION}"
......@@ -336,13 +347,6 @@ target_link_libraries(SciberQuestToolKit
install(TARGETS SciberQuestToolKit DESTINATION ${SQTK_LIB_INSTALL_PATH})
if (SQTK_PYTHON_BINDINGS)
#message(STATUS "SQTK generating vtk python bindings.")
generate_python_bindings(SciberQuestToolKit "${SM_CXX_SOURCES}")
install(TARGETS SciberQuestToolKitPython DESTINATION ${SQTK_LIB_INSTALL_PATH})
install(TARGETS SciberQuestToolKitPythonD DESTINATION ${SQTK_LIB_INSTALL_PATH})
endif()
if(PARAVIEW_USE_MPI)
include(vtkMPI)
vtk_mpi_link(SciberQuestToolKit)
......
......@@ -28,14 +28,16 @@ macro(
${Python_SRCS}
${Kit_PYTHON_EXTRA_SRCS})
PYTHON_ADD_MODULE(
_vtk_add_python_module(
${CXX_LIB_NAME}Python
${CXX_LIB_NAME}PythonInit.cxx)
target_link_libraries(
${CXX_LIB_NAME}PythonD
${CXX_LIB_NAME}Python
LINK_PRIVATE
${CXX_LIB_NAME}PythonD
LINK_PUBLIC
${CXX_LIB_NAME})
${CXX_LIB_NAME})
if(WIN32 AND NOT CYGWIN)
set_target_properties(
......
......@@ -24,19 +24,16 @@ macro(sq_add_exec _name)
set(TEST_EXEC)
sq_exec_name(${_name} TEST_NAME TEST_EXEC)
add_executable(${TEST_NAME} ${_name}.cpp TestUtils.cxx)
target_link_libraries(
${TEST_NAME}
SciberQuestToolKit
vtkPVServerManagerApplication
vtkTestingRendering
vtkIOXML
vtksys)
if (PARAVIEW_USE_MPI AND (NOT WIN32))
add_definitions(-DPARAVIEW_USE_MPI)
target_link_libraries(
${TEST_NAME}
SciberQuestToolKit
vtksys)
vtk_mpi_link(${TEST_NAME})
else()
target_link_libraries(
${TEST_NAME}
SciberQuestToolKit
vtksys)
#vtkPVServerManagerApplication)
endif()
endmacro()
......
VTK @ 28c708e9
Subproject commit 05c3c4252156f3f935c54f4b927020d045825012
Subproject commit 28c708e913ccf7d88029dec5f9db14bde0a8e54f
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