Commit f43cf465 authored by Robert Maynard's avatar Robert Maynard

Fixed compilation on windows as a utility of paraview rather than a plugin.

Had to fix all the VisIt includes to work properly in static and as a shared library. Had to change the automatic reader wrapping to not use plugin calls. Fixed numerous other bugs that cropped up.
parent 57bfd5a6
PROJECT(AVTALGORITHMS)
PROJECT(vtkVisItAVTAlgorithms)
SET(SOURCES
vtkAvtFileFormatAlgorithm.h
......@@ -12,9 +12,15 @@ vtkAvtSTSDFileFormatAlgorithm.cxx
vtkAvtSTMDFileFormatAlgorithm.h
vtkAvtSTMDFileFormatAlgorithm.cxx
)
#########################################################################
SET (dynamicHeaders "${dynamicHeaders};${PVFilters_BINARY_DIR}/vtkPVFiltersConfig.h")
CONFIGURE_FILE(${PVFilters_SOURCE_DIR}/vtkPVFiltersConfig.h.in
${PVFilters_BINARY_DIR}/vtkPVFiltersConfig.h
ESCAPE_QUOTES)
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}
......@@ -36,8 +42,9 @@ ${VISIT_SOURCE_DIR}/visit_vtk/full
${VISIT_SOURCE_DIR}/visit_vtk/lightweight
${VTK_INCLUDE_DIRS}
)
ADD_PARAVIEW_PLUGIN(AVTAlgorithms "1.0"
SERVER_MANAGER_SOURCES ${SOURCES}
)
ADD_LIBRARY(vtkVisItAVTAlgorithms ${SOURCES})
TARGET_LINK_LIBRARIES(vtkVisItAVTAlgorithms visitcommon avtdatabase_ser avtpipeline_ser visit_vtk vtkPVServerManager)
TARGET_LINK_LIBRARIES(AVTAlgorithms visitcommon avtdatabase_ser avtpipeline_ser visit_vtk)
#Install
#-------------------------------------------------------------------------------------------------
VISIT_INSTALL_TARGETS(vtkVisItAVTAlgorithms "${CMAKE_CURRENT_BINARY_DIR}/vtkAvtAlgorithmsExport.h")
\ No newline at end of file
......@@ -33,12 +33,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef _vtkAvtAlgorithmsExport_h
#define _vtkAvtAlgorithmsExport_h
#ifndef BUILD_SHARED_LIBS
#cmakedefine BUILD_SHARED_LIBS
#endif
#if defined(WIN32) && defined(BUILD_SHARED_LIBS)
# if defined(AVTAlgorithms_EXPORTS)
#if defined(WIN32) && defined(VISIT_BUILD_SHARED_LIBS)
# if defined(vtkVisItAVTAlgorithms_EXPORTS)
# define AVTALGORITHMS_EXPORT __declspec(dllexport)
# else
# define AVTALGORITHMS_EXPORT __declspec(dllimport)
......
MACRO(VISIT_INSTALL_TARGETS)
INSTALL(TARGETS ${ARGN}
DESTINATION bin
COMPONENT Runtime)
MACRO(VISIT_INSTALL_TARGETS target)
if(NOT PV_INSTALL_NO_LIBRARIES)
#install(TARGETS ${target}
# 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)
GLOB_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)
ENDMACRO(VISIT_INSTALL_TARGETS)
FUNCTION(ADD_PARALLEL_LIBRARY target)
ADD_LIBRARY(${target} ${ARGN})
IF(VISIT_PARALLEL_CXXFLAGS)
SET(PAR_COMPILE_FLAGS "")
FOREACH (X ${VISIT_PARALLEL_CXXFLAGS})
SET(PAR_COMPILE_FLAGS "${PAR_COMPILE_FLAGS} ${X}")
ENDFOREACH(X)
SET_TARGET_PROPERTIES(${target} PROPERTIES
COMPILE_FLAGS ${PAR_COMPILE_FLAGS}
)
IF(VISIT_PARALLEL_LINKER_FLAGS)
SET(PAR_LINK_FLAGS "")
FOREACH(X ${VISIT_PARALLEL_LINKER_FLAGS})
SET(PAR_LINK_FLAGS "${PAR_LINK_FLAGS} ${X}")
ENDFOREACH(X)
SET_TARGET_PROPERTIES(${target} PROPERTIES
LINK_FLAGS ${PAR_LINK_FLAGS}
)
ENDIF(VISIT_PARALLEL_LINKER_FLAGS)
IF(VISIT_PARALLEL_RPATH)
SET(PAR_RPATHS "")
FOREACH(X ${CMAKE_INSTALL_RPATH})
SET(PAR_RPATHS "${PAR_RPATHS} ${X}")
ENDFOREACH(X)
FOREACH(X ${VISIT_PARALLEL_RPATH})
SET(PAR_RPATHS "${PAR_RPATHS} ${X}")
ENDFOREACH(X)
SET_TARGET_PROPERTIES(${target} PROPERTIES
INSTALL_RPATH ${PAR_RPATHS}
)
ENDIF(VISIT_PARALLEL_RPATH)
IF(NOT VISIT_NOLINK_MPI_WITH_LIBRARIES)
TARGET_LINK_LIBRARIES(${target} ${VISIT_PARALLEL_LIBS})
ENDIF(NOT VISIT_NOLINK_MPI_WITH_LIBRARIES)
ENDIF(VISIT_PARALLEL_CXXFLAGS)
ENDFUNCTION(ADD_PARALLEL_LIBRARY)
MACRO(VISIT_VTK_THIRD_PARTY_INCLUDE upper lower)
if(VTK_USE_SYSTEM_${upper})
if(${upper}_INCLUDE_DIR)
......@@ -18,12 +74,12 @@ MACRO(VISIT_VTK_THIRD_PARTY_INCLUDE upper lower)
endif(VTK_USE_SYSTEM_${upper})
ENDMACRO(VISIT_VTK_THIRD_PARTY_INCLUDE)
MACRO(VISIT_PLUGIN_INCLUDES)
MACRO(VISIT_READER_INCLUDES)
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${AVTALGORITHMS_BINARY_DIR}
${AVTALGORITHMS_SOURCE_DIR}
${vtkVisItAVTAlgorithms_BINARY_DIR}
${vtkVisItAVTAlgorithms_SOURCE_DIR}
${VISIT_COMMON_INCLUDES}
${VISIT_SOURCE_DIR}/include
${AVT_DATABASE_SOURCE_DIR}/Database
......@@ -43,20 +99,79 @@ MACRO(VISIT_PLUGIN_INCLUDES)
${BOOST_INCLUDE_DIR}
${VTK_INCLUDE_DIRS}
)
ENDMACRO(VISIT_PLUGIN_INCLUDES)
ENDMACRO(VISIT_READER_INCLUDES)
#called from readers that are being built into paraview
FUNCTION(ADD_VISIT_READER NAME VERSION)
set(PLUGIN_NAME "vtk${NAME}")
set(PLUGIN_VERSION "${VERSION}")
set(ARG_VISIT_READER_NAME)
set(ARG_VISIT_INCLUDE_NAME)
set(ARG_VISIT_READER_TYPE)
set(ARG_VISIT_READER_FILE_PATTERN)
set(ARG_VISIT_READER_USES_OPTIONS OFF)
set(ARG_SERVER_SOURCES)
PV_PLUGIN_PARSE_ARGUMENTS(ARG
"VISIT_READER_NAME;VISIT_INCLUDE_NAME;VISIT_READER_TYPE;VISIT_READER_FILE_PATTERN;VISIT_READER_USES_OPTIONS;SERVER_SOURCES"
"" ${ARGN} )
#check reader types
string(REGEX MATCH "^[SM]T[SM]D$" VALID_READER_TYPE ${ARG_VISIT_READER_TYPE})
if ( NOT VALID_READER_TYPE)
MESSAGE(FATAL_ERROR "Invalid Reader Type. Valid Types are STSD, STMD, MTSD, MTMD")
endif()
#if the user hasn't defined an include name, we presume the reader name
#is also the include name
if(NOT ARG_VISIT_INCLUDE_NAME)
set(ARG_VISIT_INCLUDE_NAME ${ARG_VISIT_READER_NAME})
endif()
MESSAGE(STATUS "Generating wrappings for ${PLUGIN_NAME}")
VISIT_READER_INCLUDES()
if(ARG_VISIT_READER_USES_OPTIONS)
#determine the name of the plugin info class by removing the
#avt from the start and the FileFormat from the back
string(REGEX REPLACE "^avt|FileFormat$" "" TEMP_NAME ${ARG_VISIT_READER_NAME})
set(ARG_VISIT_PLUGIN_INFO_HEADER ${TEMP_NAME}PluginInfo)
set(ARG_VISIT_PLUGIN_INFO_CLASS ${TEMP_NAME}CommonPluginInfo)
endif()
set(XML_NAME ${NAME})
#need to generate the VTK class wrapper
string(SUBSTRING ${ARG_VISIT_READER_TYPE} 0 2 READER_WRAPPER_TYPE)
configure_file(
${VISIT_CMAKE_DIR}/VisItExport.h.in
${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}Export.h @ONLY)
configure_file(
${VISIT_CMAKE_DIR}/VisIt${READER_WRAPPER_TYPE}.h.in
${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.h @ONLY)
configure_file(
${VISIT_CMAKE_DIR}/VisIt${READER_WRAPPER_TYPE}.cxx.in
${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.cxx @ONLY)
set(reader_sources
${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.cxx
${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}.h
)
add_library(${NAME} ${ARG_SERVER_SOURCES} ${reader_sources})
ENDFUNCTION(ADD_VISIT_READER)
#Used for readers that are plugins for paraview
FUNCTION(ADD_VISIT_PLUGIN_READER NAME VERSION)
set(PLUGIN_NAME "vtk${NAME}")
set(PLUGIN_VERSION "${VERSION}")
set(ARG_VISIT_READER_NAME)
set(ARG_VISIT_INCLUDE_NAME)
set(ARG_VISIT_READER_TYPE)
set(ARG_VISIT_READER_FILE_PATTERN)
set(ARG_VISIT_READER_USES_OPTIONS OFF)
set(ARG_SERVER_SOURCES)
PV_PLUGIN_PARSE_ARGUMENTS(ARG
"VISIT_READER_NAME;VISIT_INCLUDE_NAME;VISIT_READER_TYPE;VISIT_READER_FILE_PATTERN;VISIT_READER_USES_OPTIONS;SERVER_SOURCES"
"VISIT_READER_NAME;VISIT_INCLUDE_NAME;VISIT_READER_TYPE;VISIT_READER_USES_OPTIONS;SERVER_SOURCES"
"" ${ARGN} )
#check reader types
string(REGEX MATCH "^[SM]T[SM]D$" VALID_READER_TYPE ${ARG_VISIT_READER_TYPE})
......@@ -72,7 +187,7 @@ if(NOT ARG_VISIT_INCLUDE_NAME)
endif()
MESSAGE(STATUS "Generating wrappings for ${PLUGIN_NAME}")
VISIT_PLUGIN_INCLUDES()
VISIT_READER_INCLUDES()
if(ARG_VISIT_READER_USES_OPTIONS)
#determine the name of the plugin info class by removing the
......@@ -126,9 +241,9 @@ list(APPEND PV_ARGS "SERVER_MANAGER_XML;${reader_server_xml}")
list(APPEND PV_ARGS "GUI_RESOURCE_FILES;${reader_client_xml}")
ADD_PARAVIEW_PLUGIN( ${NAME} ${VERSION} ${PV_ARGS} )
ENDFUNCTION(ADD_VISIT_READER)
ENDFUNCTION(ADD_VISIT_PLUGIN_READER)
FUNCTION(ADD_VISIT_INTERFACE_READER NAME VERSION)
FUNCTION(ADD_VISIT_INTERFACE_PLUGIN_READER NAME VERSION)
set(INTERFACE_NAME "vtk${NAME}")
set(INTERFACE_VERSION "${VERSION}")
......@@ -151,7 +266,7 @@ endif()
message(STATUS "Generating wrappings for ${INTERFACE_NAME}")
VISIT_PLUGIN_INCLUDES()
VISIT_READER_INCLUDES()
#check reader types
set(INTERFACE_SOURCES)
......@@ -234,13 +349,12 @@ list(APPEND PV_ARGS "GUI_RESOURCE_FILES;${INTERFACE_GUIXML}")
ADD_PARAVIEW_PLUGIN( ${NAME} ${VERSION} ${PV_ARGS} )
ENDFUNCTION(ADD_VISIT_INTERFACE_READER)
ENDFUNCTION(ADD_VISIT_INTERFACE_PLUGIN_READER)
FUNCTION(VISIT_INCLUDE_READER_SOURCE name)
option(VISIT_BUILD_PLUGIN_${name} "Build VisIt reader {name} plugin" ON)
if (VISIT_BUILD_PLUGIN_${dir})
ADD_SUBDIRECTORY(${dir})
if (VISIT_BUILD_PLUGIN_${name})
ADD_SUBDIRECTORY(${name})
endif()
ENDFUNCTION(VISIT_INCLUDE_READER_SOURCE name)
\ No newline at end of file
......@@ -7,7 +7,7 @@
All rights reserved.
ParaView is a free software; you can redistribute it and/or modify it
under the terms of the ParaView license version 1.2.
under the terms of the ParaView license version 1.2.
See License_v1.2.txt for the full ParaView license.
A copy of this license can be obtained by contacting
......@@ -33,11 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef _@PLUGIN_NAME@Export_h
#define _@PLUGIN_NAME@Export_h
#ifndef BUILD_SHARED_LIBS
#cmakedefine BUILD_SHARED_LIBS
#endif
#if defined(WIN32) && defined(BUILD_SHARED_LIBS)
#if defined(WIN32) && defined(VISIT_BUILD_SHARED_LIBS)
# if defined(@NAME@_EXPORTS)
# define @PLUGIN_NAME@_EXPORT __declspec(dllexport)
# else
......
......@@ -11,11 +11,22 @@ IF (COMMAND cmake_policy)
ENDIF (COMMAND cmake_policy)
#set up some vars we need to compile
set(BUILD_SHARED_LIBS ${PARAVIEW_BUILD_SHARED_LIBS})
set(VISIT_STATIC)
if (BUILD_SHARED_LIBS)
set(VISIT_STATIC 0)
add_definitions(-DVISIT_BUILD_SHARED_LIBS)
else(VISIT_STATIC)
set(VISIT_STATIC 1)
add_definitions(-DVISIT_STATIC -DGLEW_STATIC)
endif()
set(VISIT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
set(VISIT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
set(VISIT_CMAKE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/CMake )
#include the visit cmake directory on the cmake search path
SET (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${VISIT_CMAKE_DIR})
#include the visit install target and plugin function
include(${VISIT_CMAKE_DIR}/VisItCommon.cmake)
......@@ -32,11 +43,11 @@ ENDIF(VTK_USE_MPI)
#block out most of the warnings in visit on windows
IF (WIN32)
ADD_DEFINITIONS(-D_USE_MATH_DEFINES)
IF ("${VISIT_MSVC_VERSION}" STREQUAL "MSVC80")
IF (MSVC_VERSION GREATER 1400)
ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
ADD_DEFINITIONS(-D_SCL_NO_DEPRECATE -D_SCL_SECURE_NO_DEPRECATE)
ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
ENDIF ("${VISIT_MSVC_VERSION}" STREQUAL "MSVC80")
ENDIF (MSVC_VERSION GREATER 1400)
ENDIF(WIN32)
#-----------------------------------------------------------------------------
......@@ -109,7 +120,11 @@ ENDIF(WIN32)
# Check for plugin extension
IF(VISIT_STATIC)
SET(VISIT_PLUGIN_EXTENSION ".a")
IF(WIN32)
SET(VISIT_PLUGIN_EXTENSION ".dll")
ELSE(WIN32)
SET(VISIT_PLUGIN_EXTENSION ".lib")
ENDIF(WIN32)
ELSE(VISIT_STATIC)
IF(WIN32)
SET(VISIT_PLUGIN_EXTENSION ".dll")
......@@ -230,5 +245,4 @@ add_subdirectory(third_party_builtin)
add_subdirectory(visit_vtk)
add_subdirectory(avt)
add_subdirectory(AvtAlgorithms)
add_subdirectory(databases)
add_subdirectory(databases)
\ No newline at end of file
......@@ -39,7 +39,7 @@
#ifndef DBATTS_EXPORTS_H
#define DBATTS_EXPORTS_H
#if defined(_WIN32)
#if defined(WIN32) && defined(VISIT_BUILD_SHARED_LIBS)
#if defined(AVTDBATTS_EXPORTS) || defined(avtdbatts_EXPORTS)
#define DBATTS_API __declspec(dllexport)
#else
......
......@@ -39,7 +39,7 @@
#ifndef AVTDDF_EXPORTS_H
#define AVTDDF_EXPORTS_H
#if defined(_WIN32)
#if defined(WIN32) && defined(VISIT_BUILD_SHARED_LIBS)
#if defined(AVTDDF_EXPORTS) || defined(avtddf_ser_EXPORTS) || defined(avtddf_par_EXPORTS)
#define AVTDDF_API __declspec(dllexport)
#else
......
......@@ -39,7 +39,7 @@
#ifndef DATABASE_EXPORTS_H
#define DATABASE_EXPORTS_H
#if defined(_WIN32)
#if defined(WIN32) && defined(VISIT_BUILD_SHARED_LIBS)
#if defined(AVTDATABASE_EXPORTS) || defined(avtdatabase_ser_EXPORTS) || defined(avtdatabase_par_EXPORTS)
#define DATABASE_API __declspec(dllexport)
#else
......
......@@ -39,7 +39,7 @@
#ifndef EXPRESSION_EXPORTS_H
#define EXPRESSION_EXPORTS_H
#if defined(_WIN32)
#if defined(WIN32) && defined(VISIT_BUILD_SHARED_LIBS)
#if defined(AVTEXPRESSION_EXPORTS) || defined(avtexpressions_ser_EXPORTS) || defined(avtexpressions_par_EXPORTS)
#define EXPRESSION_API __declspec(dllexport)
#else
......
......@@ -39,7 +39,7 @@
#ifndef AVTFILEWRITER_EXPORTS_H
#define AVTFILEWRITER_EXPORTS_H
#if defined(_WIN32)
#if defined(WIN32) && defined(VISIT_BUILD_SHARED_LIBS)
#if defined(AVTWRITER_EXPORTS) || defined(avtwriter_ser_EXPORTS) || defined(avtwriter_par_EXPORTS)
#define AVTFILEWRITER_API __declspec(dllexport)
#else
......
......@@ -39,7 +39,7 @@
#ifndef AVTFILTERS_EXPORTS_H
#define AVTFILTERS_EXPORTS_H
#if defined(_WIN32)
#if defined(WIN32) && defined(VISIT_BUILD_SHARED_LIBS)
#if defined(AVTFILTERS_EXPORTS) || defined(avtfilters_ser_EXPORTS) || defined(avtfilters_par_EXPORTS)
#define AVTFILTERS_API __declspec(dllexport)
#else
......
......@@ -39,7 +39,7 @@
#ifndef IVP_EXPORTS_H
#define IVP_EXPORTS_H
#if defined(_WIN32)
#if defined(WIN32) && defined(VISIT_BUILD_SHARED_LIBS)
#if defined(AVTIVP_EXPORTS) || defined(avtivp_EXPORTS)
#define IVP_API __declspec(dllexport)
#else
......
......@@ -39,7 +39,7 @@
#ifndef MIR_EXPORTS_H
#define MIR_EXPORTS_H
#if defined(_WIN32)
#if defined(WIN32) && defined(VISIT_BUILD_SHARED_LIBS)
#if defined(AVTMIR_EXPORTS) || defined(avtmir_ser_EXPORTS) || defined(avtmir_par_EXPORTS)
#define MIR_API __declspec(dllexport)
#else
......
......@@ -39,7 +39,7 @@
#ifndef MATH_EXPORTS_H
#define MATH_EXPORTS_H
#if defined(_WIN32)
#if defined(WIN32) && defined(VISIT_BUILD_SHARED_LIBS)
#if defined(AVTMATH_EXPORTS) || defined(avtmath_EXPORTS)
#define MATH_API __declspec(dllexport)
#else
......
......@@ -209,8 +209,8 @@ ${AVT_DBATTS_SOURCE_DIR}/SIL
${AVT_DATABASE_SOURCE_DIR}/Database
${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}/AbstractFilters
${AVT_PIPELINE_SOURCE_DIR}/Pipeline
${AVT_PIPELINE_SOURCE_DIR}/Sinks
${AVT_PIPELINE_SOURCE_DIR}/Sources
......
......@@ -39,7 +39,7 @@
#ifndef PIPELINE_EXPORTS_H
#define PIPELINE_EXPORTS_H
#if defined(_WIN32)
#if defined(WIN32) && defined(VISIT_BUILD_SHARED_LIBS)
#if defined(AVTPIPELINE_EXPORTS) || defined(avtpipeline_ser_EXPORTS) || defined(avtpipeline_par_EXPORTS)
#define PIPELINE_API __declspec(dllexport)
#else
......
......@@ -39,7 +39,7 @@
#ifndef PLOTTER_EXPORTS_H
#define PLOTTER_EXPORTS_H
#if defined(_WIN32)
#if defined(WIN32) && defined(VISIT_BUILD_SHARED_LIBS)
#if defined(AVTPLOTTER_EXPORTS) || defined(avtplotter_ser_EXPORTS) || defined(avtplotter_par_EXPORTS)
#define PLOTTER_API __declspec(dllexport)
#else
......
......@@ -39,7 +39,7 @@
#ifndef PREP_EXPORTS_H
#define PREP_EXPORTS_H
#if defined(_WIN32)
#if defined(WIN32) && defined(VISIT_BUILD_SHARED_LIBS)
#ifdef PREP_EXPORTS
#define PREP_API __declspec(dllexport)
#else
......
......@@ -39,7 +39,7 @@
#ifndef AVTPYTHON_FILTERS_EXPORTS_H
#define AVTPYTHON_FILTERS_EXPORTS_H
#if defined(_WIN32)
#if defined(WIN32) && defined(VISIT_BUILD_SHARED_LIBS)
#if defined(AVTPYTHONFILTERS_EXPORTS) || defined(avtpythonfilters_ser_EXPORTS) || defined(avtpythonfilters_par_EXPORTS)
#define AVTPYTHON_FILTERS_API __declspec(dllexport)
#else
......
......@@ -39,7 +39,7 @@
#ifndef QTVISWINDOW_EXPORTS_H
#define QTVISWINDOW_EXPORTS_H
#if defined(_WIN32)
#if defined(WIN32) && defined(VISIT_BUILD_SHARED_LIBS)
#if defined(AVTQTVISWINDOW_EXPORTS) || defined (avtqtviswindow_EXPORTS)
#define QTVISWINDOW_API __declspec(dllexport)
#else
......
......@@ -39,7 +39,7 @@
#ifndef QUERY_EXPORTS_H
#define QUERY_EXPORTS_H
#if defined(_WIN32)
#if defined(WIN32) && defined(VISIT_BUILD_SHARED_LIBS)
#if defined(AVTQUERY_EXPORTS) || defined(avtquery_ser_EXPORTS) || defined(avtquery_par_EXPORTS)
#define QUERY_API __declspec(dllexport)
#else
......
......@@ -39,7 +39,7 @@
#ifndef AVTSHAPELETS_EXPORTS_H
#define AVTSHAPELETS_EXPORTS_H
#if defined(_WIN32)
#if defined(WIN32) && defined(VISIT_BUILD_SHARED_LIBS)
#if defined(AVTSHAPELETS_EXPORTS) || defined(avtshapelets_EXPORTS)
#define AVTSHAPELETS_API __declspec(dllexport)
#else
......
......@@ -39,7 +39,7 @@
#ifndef AVTVIEW_EXPORTS_H
#define AVTVIEW_EXPORTS_H
#if defined(_WIN32)
#if defined(WIN32) && defined(VISIT_BUILD_SHARED_LIBS)
#if defined(AVTVIEW_EXPORTS) || defined(avtview_EXPORTS)
#define AVTVIEW_API __declspec(dllexport)
#else
......
......@@ -39,7 +39,7 @@
#ifndef VISWINDOW_EXPORTS_H
#define VISWINDOW_EXPORTS_H
#if defined(_WIN32)
#if defined(WIN32) && defined(VISIT_BUILD_SHARED_LIBS)
#if defined(VISWINDOW_EXPORTS) || defined(avtviswindow_ser_EXPORTS) || defined(avtviswindow_par_EXPORTS)
#define VISWINDOW_API __declspec(dllexport)
#define VISWINDOW_API2 __declspec(dllexport)
......
......@@ -285,7 +285,7 @@ IF(WIN32)
PROPERTIES LANGUAGE CXX)
ENDIF(WIN32)
ADD_LIBRARY(visitcommon
ADD_LIBRARY(visitcommon SHARED
${COMM_SOURCES} ${COMM_WIN32_SOURCES}
${EXCEPTION_SOURCES}
${EXPRESSION_SOURCES}
......
......@@ -39,7 +39,7 @@
#ifndef AVTEXCEPTION_EXPORTS_H
#define AVTEXCEPTION_EXPORTS_H
#if defined(_WIN32)
#if defined(WIN32) && defined(VISIT_BUILD_SHARED_LIBS)
# if defined(AVTEXCEPTION_EXPORTS) || defined(visitcommon_EXPORTS)
# define AVTEXCEPTION_API __declspec(dllexport)
# else
......
......@@ -62,7 +62,7 @@
// ****************************************************************************
// Method: ParentProcess::ParentProcess
//
// Purpose:
// Purpose:
// Constructor for the ParentProcess class. This method reads
// through the list of arguments given to it and removes any
// having to do with the setup of sockets. It then uses the
......@@ -70,9 +70,9 @@
//
// Arguments:
//
// Returns:
// Returns:
//
// Note:
// Note:
// Note that in this class, -rport corresponds to write instead
// of read and vice-versa. This is because we're now on tbe other
// side of the socket and have to reverse.
......@@ -114,7 +114,7 @@ ParentProcess::ParentProcess() : version(VISIT_VERSION), localUserName()
// ****************************************************************************
// Method: ParentProcess::~ParentProcess
//
// Purpose:
// Purpose:
// Destructor for the ParentProcess class. It closes any open file
// descriptors.
//
......@@ -188,7 +188,7 @@ ParentProcess::~ParentProcess()
// ****************************************************************************
// Method: ParentProcess::SetVersion
//
// Purpose:
// Purpose:
// Sets the version string reported back to RemoteProcess.
//
// Arguments:
......@@ -198,7 +198,7 @@ ParentProcess::~ParentProcess()
// Creation: Thu Apr 26 15:59:26 PST 2001
//
// Modifications:
//
//
// ****************************************************************************
void
......@@ -210,7 +210,7 @@ ParentProcess::SetVersion(const std::string &ver)
// ****************************************************************************
// Method: ParentProcess::Connect
//
// Purpose:
// Purpose:
// Reads the command line arguments and removes -rhost, -rport,
// -wport. Once these arguments have been read, it uses the
// information that was passed to create sockets to talk to the
......@@ -222,16 +222,16 @@ ParentProcess::SetVersion(const std::string &ver)
// createSockets : Set this to true if you want the routine to
// create sockets as it digests the command line
// arguments. This was added to support parallel.
// Returns:
// Returns:
//
// Note:
// Note:
//