Commit 463b4fba authored by David E. DeMarle's avatar David E. DeMarle

Port build system to modular VTK era.

Add new top level modular VTK cmakelist and module.cmake files and
restructure database to build in AVTAlgorithm classes into same library as
databases that subclass them.
Remove explicit wrapping and installation cmake commands since modular
VTK takes care of it.
Use VTK add library macros that old PV one was promoted too.
Change to use new export macro defined by the module.
Whitespace and ANNOYING_OLD_CMAKE_UPPERCASE_STYLE cleanup.
parent 1cfa56a3
vtk_module_third_party(VisItLib
LIBRARIES VisItLib
NO_ADD_SUBDIRECTORY
)
if(VTK_USE_SYSTEM_VISITLIB)
return()
endif()
add_subdirectory(VisItLib)
#any module that uses visitlib needs to know where its internal
#include directories are
list(APPEND VisItLib_INCLUDE_DIRS ${VISITBRIDGE_INCLUDE_DIRS})
vtk_module_export_info()
MACRO(VISIT_INSTALL_TARGETS target)
if(NOT PV_INSTALL_NO_LIBRARIES)
install(TARGETS ${target}
EXPORT ${PV_INSTALL_EXPORT_NAME}
RUNTIME DESTINATION ${PV_INSTALL_BIN_DIR} COMPONENT Runtime
LIBRARY DESTINATION ${PV_INSTALL_LIB_DIR} COMPONENT Runtime
ARCHIVE DESTINATION ${PV_INSTALL_LIB_DIR} COMPONENT Development)
endif(NOT PV_INSTALL_NO_LIBRARIES)
# Development
if(NOT PV_INSTALL_NO_DEVELOPMENT)
#VisIt has subdirectories so we need
#to glob everything in the root directory
#and all the headers in all the subdirectores
GLOB_RECURSIVE_INSTALL_DEVELOPMENT(
${CMAKE_CURRENT_SOURCE_DIR}
${PV_INSTALL_INCLUDE_DIR}
"*.h;*.hxx;*.txx")
if(dynamicHeaders)
INSTALL(
FILES ${dynamicHeaders}
DESTINATION ${PV_INSTALL_INCLUDE_DIR}
COMPONENT Development)
endif(dynamicHeaders)
endif(NOT PV_INSTALL_NO_DEVELOPMENT)
MACRO(VISIT_INSTALL_TARGETS target)
# DDM - Removed to let vtk modular take care of installation
# if(NOT PV_INSTALL_NO_LIBRARIES)
# install(TARGETS ${target}
# EXPORT ${PV_INSTALL_EXPORT_NAME}
# RUNTIME DESTINATION ${PV_INSTALL_BIN_DIR} COMPONENT Runtime
# LIBRARY DESTINATION ${PV_INSTALL_LIB_DIR} COMPONENT Runtime
# ARCHIVE DESTINATION ${PV_INSTALL_LIB_DIR} COMPONENT Development)
# endif(NOT PV_INSTALL_NO_LIBRARIES)
# # Development
# if(NOT PV_INSTALL_NO_DEVELOPMENT)
# #VisIt has subdirectories so we need
# #to glob everything in the root directory
# #and all the headers in all the subdirectores
# if (0)
# GLOB_RECURSIVE_INSTALL_DEVELOPMENT(
# ${CMAKE_CURRENT_SOURCE_DIR}
# ${PV_INSTALL_INCLUDE_DIR}
# "*.h;*.hxx;*.txx")
# if(dynamicHeaders)
# INSTALL(
# FILES ${dynamicHeaders}
# DESTINATION ${PV_INSTALL_INCLUDE_DIR}
# COMPONENT Development)
# endif(dynamicHeaders)
# endif()
# endif(NOT PV_INSTALL_NO_DEVELOPMENT)
#
ENDMACRO(VISIT_INSTALL_TARGETS)
FUNCTION(ADD_PARALLEL_LIBRARY target)
PVVTK_ADD_LIBRARY(${target} ${ARGN})
VTK_ADD_LIBRARY(${target} ${ARGN})
IF(VISIT_PARALLEL_CXXFLAGS)
SET(PAR_COMPILE_FLAGS "")
FOREACH (X ${VISIT_PARALLEL_CXXFLAGS})
......@@ -145,7 +148,6 @@ FUNCTION(ADD_VISIT_READER NAME VERSION)
CACHE INTERNAL "visit sources for readers")
set(VISIT_DB_INC_DIRS ${VISIT_DB_INC_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}
CACHE INTERNAL "include directories")
ENDFUNCTION(ADD_VISIT_READER)
#called from readers that are being built into paraview
......
......@@ -32,11 +32,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef _@PLUGIN_NAME@_h
#define _@PLUGIN_NAME@_h
#include "@PLUGIN_NAME@Export.h"
#include "vtkIOVisItBridgeModule.h" //for export macro
#include "vtkAvt@ARG_VISIT_READER_TYPE@FileFormatAlgorithm.h"
#cmakedefine VISIT_READER_USES_INTERFACE
class @PLUGIN_NAME@_EXPORT @PLUGIN_NAME@ : public vtkAvt@ARG_VISIT_READER_TYPE@FileFormatAlgorithm
class VTKIOVISITBRIDGE_EXPORT @PLUGIN_NAME@ : public vtkAvt@ARG_VISIT_READER_TYPE@FileFormatAlgorithm
{
public:
static @PLUGIN_NAME@ *New();
......
......@@ -32,11 +32,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef _@PLUGIN_NAME@_h
#define _@PLUGIN_NAME@_h
#include "@PLUGIN_NAME@Export.h"
#include "vtkIOVisItBridgeModule.h" //for export macro
#include "vtkAvt@ARG_VISIT_READER_TYPE@FileFormatAlgorithm.h"
#cmakedefine VISIT_READER_USES_INTERFACE
class @PLUGIN_NAME@_EXPORT @PLUGIN_NAME@ : public vtkAvt@ARG_VISIT_READER_TYPE@FileFormatAlgorithm
class VTKIOVISITBRIDGE_EXPORT @PLUGIN_NAME@ : public vtkAvt@ARG_VISIT_READER_TYPE@FileFormatAlgorithm
{
public:
static @PLUGIN_NAME@ *New();
......
This diff is collapsed.
......@@ -5,4 +5,3 @@ SET(HAVE_LIBMILI "@HAVE_LIBMILI@")
#Setup the use file for VisIt
SET(VISITBRIDGE_INCLUDE_DIRS "@VISITBRIDGE_INCLUDE_DIRS@")
......@@ -84,7 +84,7 @@ ${AVT_DBATTS_SOURCE_DIR}/SIL
# Add link directories needed.
LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY})
PVVTK_ADD_LIBRARY(avtdbatts ${METADATA_SOURCES} ${SIL_SOURCES})
VTK_ADD_LIBRARY(avtdbatts ${METADATA_SOURCES} ${SIL_SOURCES})
TARGET_LINK_LIBRARIES(avtdbatts visitcommon)
......
......@@ -109,7 +109,7 @@ LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${VTK_LIBRARY_DIRS})
#********************************* SERIAL ************************************
PVVTK_ADD_LIBRARY(avtdatabase_ser ${AVTDATABASE_SOURCES})
VTK_ADD_LIBRARY(avtdatabase_ser ${AVTDATABASE_SOURCES})
TARGET_LINK_LIBRARIES(avtdatabase_ser visitcommon avtdbatts ${AVTMIR_SER} avtpipeline_ser visit_vtk)
VISIT_INSTALL_TARGETS(avtdatabase_ser)
......
......@@ -61,7 +61,7 @@ ${VTK_INCLUDE_DIRS}
# Add link directories
LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${VTK_LIBRARY_DIRS})
PVVTK_ADD_LIBRARY(avtivp ${AVTIVP_SOURCES})
VTK_ADD_LIBRARY(avtivp ${AVTIVP_SOURCES})
TARGET_LINK_LIBRARIES(avtivp avtmath visitcommon visit_vtk vtkCommonCore vtkFiltersGeneral)
VISIT_INSTALL_TARGETS(avtivp)
......@@ -59,7 +59,7 @@ ${VTK_INCLUDE_DIRS}
# Add link directories
LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${VTK_LIBRARY_DIRS})
PVVTK_ADD_LIBRARY(avtmath ${AVTMATH_SOURCES})
VTK_ADD_LIBRARY(avtmath ${AVTMATH_SOURCES})
TARGET_LINK_LIBRARIES(avtmath visitcommon vtkCommonCore)
VISIT_INSTALL_TARGETS(avtmath)
......@@ -223,7 +223,7 @@ LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${VTK_LIBRARY_DIRS})
#********************************* SERIAL ************************************
PVVTK_ADD_LIBRARY(avtpipeline_ser ${ALL_SOURCES})
VTK_ADD_LIBRARY(avtpipeline_ser ${ALL_SOURCES})
target_link_libraries(avtpipeline_ser
visitcommon
......
......@@ -283,7 +283,7 @@ IF(WIN32)
PROPERTIES LANGUAGE CXX)
ENDIF(WIN32)
PVVTK_ADD_LIBRARY(visitcommon
VTK_ADD_LIBRARY(visitcommon
${COMM_SOURCES} ${COMM_WIN32_SOURCES}
${EXCEPTION_SOURCES}
${EXPRESSION_SOURCES}
......
......@@ -114,7 +114,7 @@ get_directory_property(tmp_include_dirs INCLUDE_DIRECTORIES)
set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES
"${VISIT_SOURCE_DIR}/parser;${tmp_include_dirs}")
PVVTK_ADD_LIBRARY(visit_vtk ${VISIT_VTK_SOURCES})
VTK_ADD_LIBRARY(visit_vtk ${VISIT_VTK_SOURCES})
target_link_libraries(visit_vtk
lightweight_visit_vtk
......
......@@ -74,7 +74,7 @@ ${VISIT_SOURCE_DIR}/visit_vtk/lightweight
# Add link directories needed to use our libraries and VTK.
LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${VTK_LIBRARY_DIRS})
PVVTK_ADD_LIBRARY(lightweight_visit_vtk
VTK_ADD_LIBRARY(lightweight_visit_vtk
${LIGHTWEIGHT_VISIT_VTK_SOURCES}
)
......
vtk_module(VisItLib
DEPENDS
vtkCommonDataModel
vtkCommonExecutionModel
vtkCommonMisc
vtkFiltersAMR
vtkFiltersFlowPaths
vtkImagingHybrid
vtkIOGeometry
vtkIOImage
vtkParallelCore
vtkRenderingFreeTypeOpenGL
vtkRenderingVolumeOpenGL
EXCLUDE_FROM_WRAPPING
)
/*=========================================================================
Program: Visualization Toolkit
Module: vtk_visitlib.h
Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
All rights reserved.
See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
#ifndef __vtk_visitlib_h
#define __vtk_visitlib_h
#endif
PROJECT(vtkVisItAVTAlgorithms)
SET(KIT VisItAVTAlgorithms)
SET(KIT_UPCASE "VISITAVTALGORITHMS")
SET(Kit_SRCS
set(Kit_SRCS
vtkAvtFileFormatAlgorithm.h
vtkAvtFileFormatAlgorithm.cxx
vtkAvtMTSDFileFormatAlgorithm.h
......@@ -16,71 +11,10 @@ vtkAvtSTMDFileFormatAlgorithm.h
vtkAvtSTMDFileFormatAlgorithm.cxx
)
#setup the kit so we get client server bindings
SET(VTK_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}")
INCLUDE(${ParaView_CMAKE_DIR}/VTKMono/vtkExportKit.cmake)
VTK_EXPORT_KIT("${KIT}" "${KIT_UPCASE}" "${Kit_SRCS}")
#########################################################################
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/vtkAvtAlgorithmsExport.h.in"
"${CMAKE_CURRENT_BINARY_DIR}/vtkAvtAlgorithmsExport.h")
set(dynamicHeaders "${dynamicHeaders};${CMAKE_CURRENT_BINARY_DIR}/vtkAvtAlgorithmsExport.h")
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${AVT_DATABASE_SOURCE_DIR}/Database
${AVT_DATABASE_SOURCE_DIR}/Ghost
${AVT_DATABASE_SOURCE_DIR}/Formats
${VISIT_COMMON_INCLUDES}
${AVT_DBATTS_SOURCE_DIR}/MetaData
${AVT_DBATTS_SOURCE_DIR}/SIL
${VISIT_SOURCE_DIR}/avt/Math
${VISIT_SOURCE_DIR}/avt/VisWindow/VisWindow
${AVT_PIPELINE_SOURCE_DIR}/AbstractFilters
${AVT_PIPELINE_SOURCE_DIR}/Data
${AVT_PIPELINE_SOURCE_DIR}/Pipeline
${AVT_PIPELINE_SOURCE_DIR}/Sinks
${AVT_PIPELINE_SOURCE_DIR}/Sources
${VISIT_SOURCE_DIR}/visit_vtk/full
${VISIT_SOURCE_DIR}/visit_vtk/lightweight
${VTK_INCLUDE_DIRS}
)
PVVTK_ADD_LIBRARY(vtkVisItAVTAlgorithms ${Kit_SRCS})
## NOTE: Always link to vtkParallel b/c it is needed for using vtkAMRUtilities
## When creating vtkOverlappingAMR datasets (especially on windows)
IF(VISIT_PARALLEL)
TARGET_LINK_LIBRARIES(vtkVisItAVTAlgorithms visitcommon avtdatabase_par avtpipeline_par visit_vtk avtivp vtkFiltersAMR)
ELSE(VISIT_PARALLEL)
TARGET_LINK_LIBRARIES(vtkVisItAVTAlgorithms visitcommon avtdatabase_ser avtpipeline_ser visit_vtk avtivp vtkFiltersAMR)
ENDIF(VISIT_PARALLEL)
#Wrap for Python
#-------------------------------------------------------------------------------------------------
IF (PARAVIEW_ENABLE_PYTHON)
SET(Kit_PYTHON_EXTRA_SRCS)
SET(KIT_PYTHON_LIBS vtkVisItAVTAlgorithmsPythonD vtkIOCorePythonD vtkVisItAVTAlgorithmsCS)
# Tell vtkWrapPython.cmake to set VTK_PYTHON_LIBRARIES for us.
SET(VTK_WRAP_PYTHON_FIND_LIBS 1)
SET(VTK_WRAP_INCLUDE_DIRS ${VTK_INCLUDE_DIR})
INCLUDE("${VTK_CMAKE_DIR}/vtkWrapPython.cmake")
INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
SET(KIT_PYTHON_DEPS)
SET(VTK_INSTALL_NO_LIBRARIES 1)
IF(VTKPythonWrapping_INSTALL_BIN_DIR)
SET(VTK_INSTALL_NO_LIBRARIES)
ENDIF(VTKPythonWrapping_INSTALL_BIN_DIR)
SET(VTK_INSTALL_LIB_DIR "${VTKPythonWrapping_INSTALL_LIB_DIR}")
SET(VTK_INSTALL_BIN_DIR "${VTKPythonWrapping_INSTALL_BIN_DIR}")
SET(VTK_INSTALL_LIB_DIR_CM24 "${VTKPythonWrapping_INSTALL_LIB_DIR}")
SET(VTK_INSTALL_BIN_DIR_CM24 "${VTKPythonWrapping_INSTALL_BIN_DIR}")
# include python wrapping from VTK
INCLUDE(KitCommonPythonWrapBlock)
ENDIF (PARAVIEW_ENABLE_PYTHON)
set(FullPath_SRCS)
foreach(fname ${Kit_SRCS})
list(APPEND FullPath_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/${fname}")
endforeach()
#Install
#-------------------------------------------------------------------------------------------------
VISIT_INSTALL_TARGETS(vtkVisItAVTAlgorithms)
set(VISIT_SERVER_SOURCES ${FullPath_SRCS}
CACHE INTERNAL "vtk classes to wrap for client server")
......@@ -32,6 +32,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef _vtkVisItReader_h
#define _vtkVisItReader_h
#include "vtkIOVisItBridgeModule.h" //for export macro
#include "vtkCompositeDataSetAlgorithm.h"
#include "vtkAvtAlgorithmsExport.h"
#include "vtkStdString.h"
......@@ -48,7 +51,7 @@ class avtVariableCache;
class avtMeshMetaData;
//ETX
class AVTALGORITHMS_EXPORT vtkAvtFileFormatAlgorithm : public vtkCompositeDataSetAlgorithm
class VTKIOVISITBRIDGE_EXPORT vtkAvtFileFormatAlgorithm : public vtkCompositeDataSetAlgorithm
{
public:
static vtkAvtFileFormatAlgorithm *New();
......
......@@ -32,6 +32,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef _vtkAvtMTMDFileFormatAlgorithm_h
#define _vtkAvtMTMDFileFormatAlgorithm_h
#include "vtkIOVisItBridgeModule.h" //for export macro
#include "vtkAvtSTMDFileFormatAlgorithm.h"
#include "vtkAvtAlgorithmsExport.h"
......@@ -40,7 +43,7 @@ class avtDatabaseMetaData;
class avtVariableCache;
//ETX
class AVTALGORITHMS_EXPORT vtkAvtMTMDFileFormatAlgorithm : public vtkAvtSTMDFileFormatAlgorithm
class VTKIOVISITBRIDGE_EXPORT vtkAvtMTMDFileFormatAlgorithm : public vtkAvtSTMDFileFormatAlgorithm
{
public:
static vtkAvtMTMDFileFormatAlgorithm *New();
......
......@@ -32,6 +32,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef _vtkAvtMTSDFileFormatAlgorithm_h
#define _vtkAvtMTSDFileFormatAlgorithm_h
#include "vtkIOVisItBridgeModule.h" //for export macro
#include "vtkAvtSTSDFileFormatAlgorithm.h"
#include "vtkAvtAlgorithmsExport.h"
......@@ -40,7 +42,7 @@ class avtDatabaseMetaData;
class avtVariableCache;
//ETX
class AVTALGORITHMS_EXPORT vtkAvtMTSDFileFormatAlgorithm : public vtkAvtSTSDFileFormatAlgorithm
class VTKIOVISITBRIDGE_EXPORT vtkAvtMTSDFileFormatAlgorithm : public vtkAvtSTSDFileFormatAlgorithm
{
public:
static vtkAvtMTSDFileFormatAlgorithm *New();
......
......@@ -33,6 +33,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef _vtkAvtSTMDFileFormatAlgorithm_h
#define _vtkAvtSTMDFileFormatAlgorithm_h
#include "vtkIOVisItBridgeModule.h" //for export macro
#include "vtkAvtFileFormatAlgorithm.h"
#include "vtkAvtAlgorithmsExport.h"
#include "vtkStdString.h"
......@@ -54,7 +56,7 @@ class avtVariableCache;
class avtMeshMetaData;
//ETX
class AVTALGORITHMS_EXPORT vtkAvtSTMDFileFormatAlgorithm : public vtkAvtFileFormatAlgorithm
class VTKIOVISITBRIDGE_EXPORT vtkAvtSTMDFileFormatAlgorithm : public vtkAvtFileFormatAlgorithm
{
public:
static vtkAvtSTMDFileFormatAlgorithm *New();
......
......@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef _vtkAvtSTSDFileFormatAlgorithm_h
#define _vtkAvtSTSDFileFormatAlgorithm_h
#include "vtkIOVisItBridgeModule.h" //for export macro
#include "vtkAvtFileFormatAlgorithm.h"
#include "vtkAvtAlgorithmsExport.h"
......@@ -42,7 +43,7 @@ class avtDatabaseMetaData;
class avtVariableCache;
//ETX
class AVTALGORITHMS_EXPORT vtkAvtSTSDFileFormatAlgorithm : public vtkAvtFileFormatAlgorithm
class VTKIOVISITBRIDGE_EXPORT vtkAvtSTSDFileFormatAlgorithm : public vtkAvtFileFormatAlgorithm
{
public:
static vtkAvtSTSDFileFormatAlgorithm *New();
......
MACRO(VISIT_INCLUDE_READER_SOURCE name state)
#get same cmake config as visitlib itself does
include(${CMAKE_CURRENT_SOURCE_DIR}/../Library/VisItLib/visitcommoncmake.cmake)
include(${VISIT_BINARY_DIR}/VisItBridgeUse.cmake)
macro(VISIT_INCLUDE_READER_SOURCE name state)
option(VISIT_BUILD_READER_${name} "Build VisIt Reader ${name}" ${state})
if (VISIT_BUILD_READER_${name})
ADD_SUBDIRECTORY(${name})
add_subdirectory(${name})
endif()
ENDMACRO(VISIT_INCLUDE_READER_SOURCE name)
PROJECT(vtkVisItDatabases)
endmacro(VISIT_INCLUDE_READER_SOURCE name)
#these are used by visit_include_reader
set(VISIT_DATABASE_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
......@@ -80,14 +82,17 @@ if(NOT WIN32)
)
endif(NOT WIN32)
#add all the default readers to the library
#add generic vtkreader interface parent classes
add_subdirectory(AvtAlgorithms)
#add the default readers to the library
foreach(db ${DEFAULT_BRIDGE_READERS})
add_subdirectory(${db})
endforeach(db)
ADD_DEFINITIONS("-DRC_CPP_VISIT_BUILD")
add_definitions("-DRC_CPP_VISIT_BUILD")
VISIT_INCLUDE_READER_SOURCE(Silo OFF)
visit_include_reader_source(Silo OFF)
if(VISIT_BUILD_READER_Silo)
if(NOT HAVE_LIBSILO)
#if we currently don't have silo setup make it required
......@@ -100,7 +105,7 @@ if(VISIT_BUILD_READER_Silo)
endif(VISIT_BUILD_READER_Silo)
VISIT_INCLUDE_READER_SOURCE(CGNS OFF)
visit_include_reader_source(CGNS OFF)
if(VISIT_BUILD_READER_CGNS)
if(NOT HAVE_LIBCGNS)
#if we currently don't have silo setup make it required
......@@ -112,7 +117,7 @@ if(VISIT_BUILD_READER_CGNS)
set(VISITBRIDGE_USE_CGNS ${CGNS_FOUND} PARENT_SCOPE)
endif(VISIT_BUILD_READER_CGNS)
VISIT_INCLUDE_READER_SOURCE(Mili OFF)
visit_include_reader_source(Mili OFF)
if(VISIT_BUILD_READER_Mili)
if(NOT HAVE_LIBMILI)
#if we currently don't have silo setup make it required
......@@ -124,9 +129,6 @@ if(VISIT_BUILD_READER_Mili)
set(VISITBRIDGE_USE_MILI ${MILI_FOUND} PARENT_SCOPE)
endif(VISIT_BUILD_READER_Mili)
SET(KIT VisItDatabases)
SET(KIT_UPCASE "VISITDATABASES")
#include all the db directores before
#the visit files
include_directories(BEFORE
......@@ -150,66 +152,37 @@ if(HAVE_LIBMILI AND VISIT_BUILD_READER_Mili)
include_directories(${MILI_INCLUDE_DIR})
endif(HAVE_LIBMILI AND VISIT_BUILD_READER_Mili)
SET(Kit_SRCS
set(Module_SRCS
${VISIT_SERVER_SOURCES}
)
SET_SOURCE_FILES_PROPERTIES(
set_source_files_properties(
${VISIT_DB_SOURCES}
WRAP_EXCLUDE
)
#setup the kit so we get client server bindings
SET(VTK_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}")
INCLUDE(${ParaView_CMAKE_DIR}/VTKMono/vtkExportKit.cmake)
VTK_EXPORT_KIT("${KIT}" "${KIT_UPCASE}" "${Kit_SRCS}")
set(vtkIOVisItBridge_INCLUDE_DIRS "${vtkIOVisItBridge_INCLUDE_DIRS};${CMAKE_CURRENT_SOURCE_DIR}/AvtAlgorithms")
vtk_module_library(vtkIOVisItBridge ${Module_SRCS} ${VISIT_DB_SOURCES})
#build all the readers into a single library
pvvtk_add_library(vtk${KIT} ${Kit_SRCS} ${VISIT_DB_SOURCES})
if(VISIT_PARALLEL)
target_link_libraries(vtkIOVisItBridge visitcommon avtdatabase_par avtpipeline_par visit_vtk avtivp)
else(VISIT_PARALLEL)
target_link_libraries(vtkIOVisItBridge visitcommon avtdatabase_ser avtpipeline_ser visit_vtk avtivp)
endif(VISIT_PARALLEL)
target_link_libraries(vtk${KIT} vtkVisItAVTAlgorithms vtkNetCDF)
target_link_libraries(vtkIOVisItBridge vtkNetCDF)
if(PARAVIEW_HDF5_LIBRARIES)
target_link_libraries(vtk${KIT} ${PARAVIEW_HDF5_LIBRARIES})
target_link_libraries(vtkIOVisItBridge ${PARAVIEW_HDF5_LIBRARIES})
endif(PARAVIEW_HDF5_LIBRARIES)
if(HAVE_LIBSILO AND VISIT_BUILD_READER_Silo)
target_link_libraries(vtk${KIT} ${SILO_LIBRARIES})
target_link_libraries(vtkIOVisItBridge ${SILO_LIBRARIES})
endif(HAVE_LIBSILO AND VISIT_BUILD_READER_Silo)
if(HAVE_LIBCGNS AND VISIT_BUILD_READER_CGNS)
target_link_libraries(vtk${KIT} ${CGNS_LIBRARIES})
target_link_libraries(vtkIOVisItBridge ${CGNS_LIBRARIES})
endif(HAVE_LIBCGNS AND VISIT_BUILD_READER_CGNS)
if(HAVE_LIBMILI AND VISIT_BUILD_READER_Mili)
target_link_libraries(vtk${KIT} ${MILI_LIBRARIES})
target_link_libraries(vtkIOVisItBridge ${MILI_LIBRARIES})
endif(HAVE_LIBMILI AND VISIT_BUILD_READER_Mili)
#Wrap for Python
#-------------------------------------------------------------------------------------------------
IF (PARAVIEW_ENABLE_PYTHON)
SET(Kit_PYTHON_EXTRA_SRCS)
SET(KIT_PYTHON_LIBS vtk${KIT}PythonD vtk${KIT}CS
vtkVisItAVTAlgorithmsPythonD vtkVisItAVTAlgorithmsCS)
# Tell vtkWrapPython.cmake to set VTK_PYTHON_LIBRARIES for us.
SET(VTK_WRAP_PYTHON_FIND_LIBS 1)
SET(VTK_WRAP_INCLUDE_DIRS ${VTK_INCLUDE_DIR})
INCLUDE("${VTK_CMAKE_DIR}/vtkWrapPython.cmake")
INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
SET(KIT_PYTHON_DEPS)
SET(VTK_INSTALL_NO_LIBRARIES 1)
IF(VTKPythonWrapping_INSTALL_BIN_DIR)
SET(VTK_INSTALL_NO_LIBRARIES)
ENDIF(VTKPythonWrapping_INSTALL_BIN_DIR)
SET(VTK_INSTALL_LIB_DIR "${VTKPythonWrapping_INSTALL_LIB_DIR}")
SET(VTK_INSTALL_BIN_DIR "${VTKPythonWrapping_INSTALL_BIN_DIR}")
SET(VTK_INSTALL_LIB_DIR_CM24 "${VTKPythonWrapping_INSTALL_LIB_DIR}")
SET(VTK_INSTALL_BIN_DIR_CM24 "${VTKPythonWrapping_INSTALL_BIN_DIR}")
# include python wrapping from VTK
INCLUDE(KitCommonPythonWrapBlock)
ENDIF (PARAVIEW_ENABLE_PYTHON)
#Install
#-------------------------------------------------------------------------------------------------
VISIT_INSTALL_TARGETS(vtk${KIT})
vtk_module(vtkIOVisItBridge
DEPENDS
vtkCommonDataModel
vtkCommonExecutionModel
vtknetcdf
VisItLib
TEST_DEPENDS
)
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