Commit c27bd95d authored by whitlocb's avatar whitlocb

Add some BGQ-related build changes.



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@20991 18c085ea-50e0-402c-830e-de6fd14e8384
parent 8f01dce3
......@@ -38,6 +38,9 @@
# Kathleen Bonnell, Fri Dec 10 14:36:52 PST 2010
# Set ZLIB_LIB to full path.
#
# Brad Whitlock, Thu Apr 18 14:38:02 PDT 2013
# Look for zlib on other platforms if VISIT_ZLIB_DIR is set.
#
#****************************************************************************/
# Use the ZLIB_DIR hint from the config-site .cmake file
......@@ -45,10 +48,26 @@
INCLUDE(${VISIT_SOURCE_DIR}/CMake/SetUpThirdParty.cmake)
IF (WIN32)
SET_UP_THIRD_PARTY(ZLIB lib/${VISIT_MSVC_VERSION} include zlib1)
IF (ZLIB_FOUND)
# use full path here, instead of just lib file.
SET(ZLIB_LIB "${ZLIB_LIBRARY_DIR}/${ZLIB_LIB}" CACHE STRING "zlib library" FORCE)
ENDIF (ZLIB_FOUND)
SET_UP_THIRD_PARTY(ZLIB lib/${VISIT_MSVC_VERSION} include zlib1)
IF (ZLIB_FOUND)
# use full path here, instead of just lib file.
SET(ZLIB_LIB "${ZLIB_LIBRARY_DIR}/${ZLIB_LIB}" CACHE STRING "zlib library" FORCE)
SET(VTKZLIB_LIB vtkzlib)
ENDIF (ZLIB_FOUND)
ELSE(WIN32)
IF(VISIT_ZLIB_DIR)
# We've told VisIt where to look for zlib. Let's also assume that by doing
# this, we also told VTK where to find system zlib so we will not be using
# VTK's zlib
SET_UP_THIRD_PARTY(ZLIB lib include z)
IF (ZLIB_FOUND)
# use full path here, instead of just lib file.
SET(ZLIB_LIB "${ZLIB_LIBRARY_DIR}/${ZLIB_LIB}" CACHE STRING "zlib library" FORCE)
ENDIF (ZLIB_FOUND)
ELSE(VISIT_ZLIB_DIR)
SET(ZLIB_LIB z)
SET(ZLIB_FOUND 1)
SET(VTKZLIB_LIB vtkzlib)
ENDIF(VISIT_ZLIB_DIR)
ENDIF (WIN32)
......@@ -604,9 +604,19 @@ IF(WIN32)
SET(VISIT_APPLICATION_STYLE "WIN32")
ENDIF(VISIT_WINDOWS_APPLICATION)
ENDIF(WIN32)
IF(VISIT_MESA_DIR)
OPTION(VISIT_USE_MANGLED_MESA "Enable use of mangled Mesa classes in VisIt" OFF)
ENDIF(VISIT_MESA_DIR)
OPTION(VISIT_INSTALL_AS_BETA "Install as beta (symlink beta instead of current to installed version)." OFF)
OPTION(VISIT_MPICH_INSTALL "Install MPICH into VisIt binary distribution" OFF)
IF(APPLE OR WIN32)
OPTION(VISIT_USE_X "Use X11" OFF)
ELSE(APPLE OR WIN32)
OPTION(VISIT_USE_X "Use X11" ON)
ENDIF(APPLE OR WIN32)
OPTION(VISIT_USE_GLEW "Use GLEW to call GL functions." ON)
OPTION(VISIT_USE_BOOST "Use system boost library." ON)
SET(VISIT_INSTALL_PROFILES_TO_HOSTS "" CACHE STRING "Install specified host profiles (no action if empty)." )
......@@ -655,7 +665,6 @@ VISIT_3RDPARTY_VAR(TCMALLOC_DIR "Path containing the tcmalloc library's includ
IF(WIN32)
VISIT_3RDPARTY_VAR(JPEG_DIR "Path containing the jpeg library's include and lib")
VISIT_3RDPARTY_VAR(SZIP_DIR "Path containing the szip library's include and lib")
VISIT_3RDPARTY_VAR(ZLIB_DIR "Path containing the zlib library's include and lib")
ENDIF(WIN32)
# Define the options that let us pick I/O library installation locations. When
......@@ -683,6 +692,7 @@ VISIT_3RDPARTY_DEP(HDF5_LIBDEP "HDF5 library dependencies")
VISIT_3RDPARTY_VAR(H5PART_DIR "Path containing the H5Part library's include and lib")
VISIT_3RDPARTY_DEP(H5PART_LIBDEP "H5Part library dependencies")
VISIT_3RDPARTY_VAR(MILI_DIR "Path containing the Mili library's include and lib")
VISIT_3RDPARTY_VAR(OPENGL_DIR "Path containing the OpenGL library's include and lib")
VISIT_3RDPARTY_VAR(NETCDF_DIR "Path containing the NETCDF library's include and lib")
VISIT_3RDPARTY_DEP(NETCDF_LIBDEP "NETCDF library dependencies")
VISIT_3RDPARTY_VAR(R_DIR "Path containing the R library's include and lib")
......@@ -692,6 +702,8 @@ VISIT_3RDPARTY_VAR(XDMF_DIR "Path containing the Xdmf library's include and
VISIT_3RDPARTY_DEP(XDMF_LIBDEP "Xdmf library dependencies")
VISIT_3RDPARTY_VAR(MDSPLUS_DIR "Path containing the MDSplus library's include and lib")
VISIT_3RDPARTY_VAR(MANTA_DIR "Path containing the Manta library's include and lib")
VISIT_3RDPARTY_VAR(ZLIB_DIR "Path containing the zlib library's include and lib")
#-----------------------------------------------------------------------------
# Read the version
#-----------------------------------------------------------------------------
......@@ -909,8 +921,23 @@ INCLUDE(${CMAKE_ROOT}/Modules/CMakeBackwardCompatibilityCXX.cmake)
INCLUDE(${CMAKE_ROOT}/Modules/CheckTypeSize.cmake)
INCLUDE(${CMAKE_ROOT}/Modules/CheckFunctionExists.cmake)
INCLUDE(${CMAKE_ROOT}/Modules/CheckSymbolExists.cmake)
INCLUDE(${CMAKE_ROOT}/Modules/FindBoost.cmake)
INCLUDE(${CMAKE_ROOT}/Modules/FindX11.cmake)
IF(VISIT_USE_BOOST)
INCLUDE(${CMAKE_ROOT}/Modules/FindBoost.cmake)
ENDIF(VISIT_USE_BOOST)
IF(VISIT_USE_X)
INCLUDE(${CMAKE_ROOT}/Modules/FindX11.cmake)
IF(NOT X11_X11_LIB)
SET(VISIT_USE_X OFF)
SET(HAVE_LIBX11 0)
ELSE(NOT X11_X11_LIB)
SET(HAVE_LIBX11 1)
ENDIF(NOT X11_X11_LIB)
ELSE(VISIT_USE_X)
SET(HAVE_LIBX11 0)
SET(CMAKE_X_LIBS "" CACHE INTERNAL "X11 libs.")
SET(CMAKE_X_CFLAGS "" CACHE INTERNAL "X11 extra flags.")
SET(CMAKE_HAS_X 0 CACHE INTERNAL "Is X11 around.")
ENDIF(VISIT_USE_X)
INCLUDE(${CMAKE_ROOT}/Modules/TestBigEndian.cmake)
# Set Boost_USABLE_PARADIS if boost 1.36.0 or later is found. ParaDIS
......@@ -970,7 +997,22 @@ CHECK_INCLUDE_FILES (stdbool.h HAVE_STDBOOL_H)
# Configure OpenGL support.
IF(NOT VISIT_DBIO_ONLY)
INCLUDE(${CMAKE_ROOT}/Modules/FindOpenGL.cmake)
IF(VISIT_OPENGL_DIR)
SET(OPENGL_FOUND ON)
SET(OPENGL_GLU_FOUND ON)
SET(OPENGL_INCLUDE_DIR ${VISIT_OPENGL_DIR}/include)
IF(VISIT_STATIC)
SET(OPENGL_gl_LIBRARY ${VISIT_OPENGL_DIR}/lib/libGL.a)
SET(OPENGL_glu_LIBRARY ${VISIT_OPENGL_DIR}/lib/libGLU.a)
ELSE(VISIT_STATIC)
SET(OPENGL_gl_LIBRARY ${VISIT_OPENGL_DIR}/lib/libGL.so)
SET(OPENGL_glu_LIBRARY ${VISIT_OPENGL_DIR}/lib/libGLU.so)
ENDIF(VISIT_STATIC)
SET(OPENGL_LIBRARIES ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY})
MESSAGE(STATUS "Found OpenGL ${OPENGL_gl_LIBRARY}")
ELSE(VISIT_OPENGL_DIR)
INCLUDE(${CMAKE_ROOT}/Modules/FindOpenGL.cmake)
ENDIF(VISIT_OPENGL_DIR)
ENDIF(NOT VISIT_DBIO_ONLY)
# Configure Mesa support.
......@@ -1058,11 +1100,16 @@ ENDIF(VISIT_PYTHON_SCRIPTING AND PYTHONLIBS_FOUND
AND NOT VISIT_SERVER_COMPONENTS_ONLY)
# Treat GLEW as a 3rd party builtin.
SET(GLEW_FOUND 1)
ADD_DEFINITIONS(-DHAVE_LIBGLEW)
SET(GLEW_INCLUDE_DIR ${VISIT_SOURCE_DIR}/third_party_builtin/glew/glew/include)
SET(GLEW_LIBRARY_DIR ${VISIT_SOURCE_DIR}/lib)
SET(GLEW_LIB visitGLEW)
IF(VISIT_USE_GLEW)
SET(GLEW_FOUND 1)
ADD_DEFINITIONS(-DHAVE_LIBGLEW)
SET(GLEW_INCLUDE_DIR ${VISIT_SOURCE_DIR}/third_party_builtin/glew/glew/include)
SET(GLEW_LIBRARY_DIR ${VISIT_SOURCE_DIR}/lib)
SET(GLEW_LIB visitGLEW)
ELSE(VISIT_USE_GLEW)
# We're not using GLEW but we need to substitute GL
SET(GLEW_INCLUDE_DIR ${OPENGL_INCLUDE_DIR})
ENDIF(VISIT_USE_GLEW)
# Set up the tuvok library if it was enabled.
IF(VISIT_TUVOK)
......@@ -1101,18 +1148,19 @@ ENDIF(VISIT_PARALLEL)
# Include TCMALLOC support if we can.
INCLUDE(${VISIT_SOURCE_DIR}/CMake/FindTCMALLOC.cmake)
# zlib, szip and jpeg
# zlib
INCLUDE(${VISIT_SOURCE_DIR}/CMake/FindZlib.cmake)
# szip and jpeg
IF(WIN32)
INCLUDE(${VISIT_SOURCE_DIR}/CMake/FindJPEG.cmake)
INCLUDE(${VISIT_SOURCE_DIR}/CMake/FindSzip.cmake)
ENDIF(WIN32)
# dl and large file support.
IF(CMAKE_HOST_UNIX)
SET(ZLIB_LIB z)
SET(ZLIB_FOUND 1)
SET(DL_LIB dl)
ADD_DEFINITIONS(-D_LARGEFILE64_SOURCE)
ELSE(CMAKE_HOST_UNIX)
IF(WIN32)
INCLUDE(${VISIT_SOURCE_DIR}/CMake/FindZlib.cmake)
INCLUDE(${VISIT_SOURCE_DIR}/CMake/FindJPEG.cmake)
INCLUDE(${VISIT_SOURCE_DIR}/CMake/FindSzip.cmake)
ENDIF(WIN32)
ENDIF(CMAKE_HOST_UNIX)
IF(NOT VISIT_BUILD_MINIMAL_PLUGINS)
......
......@@ -79,11 +79,11 @@ vtk/vtkOpenGLTexturedBackgroundMapper.C
vtk/vtkTexturedPointsPainter.C
)
SET_SOURCE_FILES_PROPERTIES(
${AVTPLOTTER_OPENGL_SOURCES}
PROPERTIES
COMPILE_FLAGS "-I${GLEW_INCLUDE_DIR}"
)
IF(VISIT_USE_GLEW)
SET(GRAPHICS_INCLUDES ${GLEW_INCLUDE_DIR})
ELSE(VISIT_USE_GLEW)
SET(GRAPHICS_INCLUDES ${OPENGL_INCLUDE_DIR})
ENDIF(VISIT_USE_GLEW)
SET(AVTPLOTTER_VTK_SOURCES
vtk/InitVTKRendering.C
......@@ -173,8 +173,7 @@ ${VISIT_SOURCE_DIR}/visit_vtk/full
${VISIT_SOURCE_DIR}/visit_vtk/lightweight
${PROJECT_BINARY_DIR}/avt/Plotter/vtk/
${VTK_INCLUDE_DIRS}
${MESA_INCLUDE_DIR}
${GLEW_INCLUDE_DIR}
${GRAPHICS_INCLUDES}
)
# Add link directories
......
......@@ -93,7 +93,7 @@ static bool initialized = false;
bool initialize(bool force)
{
#ifdef HAVE_LIBGLEW
if(initialized && !force) // Bail early if we've already been here.
{
return true;
......@@ -197,8 +197,18 @@ bool initialize(bool force)
<< "or using the " << cmd_line << " command line option.";
EXCEPTION1(LibraryNotFoundException, noGL.str());
}
#endif
return initialized;
}
bool
supported(const char *key)
{
#ifdef HAVE_LIBGLEW
return glewIsSupported(key);
#else
return true;
#endif
}
}; /* glew */ }; /* avt */
......@@ -43,10 +43,16 @@
#define VISIT_GLEW_INITIALIZER_H
#include <plotter_exports.h>
#ifdef HAVE_LIBGLEW
// We don't need it in this header, but include GLEW here for ease of use.
// GLEW must be included before any OpenGL headers, and if clients want this
// file then *not* including GLEW wouldn't make any sense!
#include <GL/glew.h>
#else
// We're not using GLEW for OpenGL. Use straight OpenGL.
#define GL_GLEXT_PROTOTYPES
#include <GL/gl.h>
#endif
namespace avt {
namespace glew {
......@@ -64,6 +70,8 @@ namespace glew {
//
// ****************************************************************************
bool PLOTTER_API initialize(bool force=false);
bool PLOTTER_API supported(const char *);
};
};
#endif
......@@ -1000,7 +1000,9 @@ vtkOpenGLRectilinearGridMapper::BeginColorTexturing()
// after texturing. This ensures that the specular highlights look
// right when we're in texturing mode.
//
#ifdef HAVE_LIBGLEW
if(GLEW_EXT_secondary_color)
#endif
{
glEnable(GL_COLOR_SUM_EXT);
glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SEPARATE_SPECULAR_COLOR);
......@@ -1038,8 +1040,9 @@ vtkOpenGLRectilinearGridMapper::EndColorTexturing()
{
glDisable(GL_TEXTURE_1D);
}
#ifdef HAVE_LIBGLEW
if(GLEW_EXT_secondary_color)
#endif
{
glDisable(GL_COLOR_SUM_EXT);
}
......
......@@ -860,7 +860,9 @@ vtkOpenGLStructuredGridMapper::BeginColorTexturing()
// after texturing. This ensures that the specular highlights look
// right when we're in texturing mode.
//
#ifdef HAVE_LIBGLEW
if(GLEW_EXT_secondary_color)
#endif
{
glEnable(GL_COLOR_SUM_EXT);
glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SEPARATE_SPECULAR_COLOR);
......@@ -899,8 +901,12 @@ vtkOpenGLStructuredGridMapper::EndColorTexturing()
glDisable(GL_TEXTURE_1D);
}
#ifdef HAVE_LIBGLEW
if(GLEW_EXT_secondary_color)
glDisable(GL_COLOR_SUM_EXT);
#else
glDisable(GL_COLOR_SUM_EXT);
#endif
}
......
......@@ -263,11 +263,13 @@ vtkTexturedPointsPainter::Texturer::ReleaseGraphicsResources(vtkWindow *win)
void
vtkTexturedPointsPainter::Texturer::StartFancyPoints()
{
#ifdef HAVE_LIBGLEW
if(!GLEW_ARB_point_sprite)
{
// Point sprites are not supported
return;
}
#endif
// Create the textures
if(!this->SphereTexturesDataCreated)
......@@ -353,12 +355,13 @@ vtkTexturedPointsPainter::Texturer::StartFancyPoints()
void
vtkTexturedPointsPainter::Texturer::EndFancyPoints()
{
#ifdef HAVE_LIBGLEW
if(!GLEW_ARB_point_sprite)
{
// Point sprites are not supported
return;
}
#endif
// Restore the state we had before.
glPopAttrib();
glDisable(MY_POINT_SPRITE_ARB);
......
......@@ -85,6 +85,9 @@
#define FSEEK fseek
#endif
// Cast handle to gzFile.
#define GZFILE(handle) ((gzFile)handle)
static int FormatLine(char *line);
......@@ -755,10 +758,10 @@ avtBOVFileFormat::ReadWholeAndExtractBrick(void *dest, bool gzipped,
{
// Read past the specified offset.
if(byteOffset > 0)
gzseek(gz_handle, byteOffset, SEEK_SET);
gzseek(GZFILE(gz_handle), byteOffset, SEEK_SET);
// Read the whole dataset
gzread(gz_handle, whole_buff, whole_nelem * unit_size);
gzread(GZFILE(gz_handle), whole_buff, whole_nelem * unit_size);
}
else
{
......@@ -1101,9 +1104,9 @@ avtBOVFileFormat::GetVar(int dom, const char *var)
{
// Read past the specified offset.
if(byteOffset > 0)
gzseek(gz_handle, byteOffset, SEEK_SET);
gzseek(GZFILE(gz_handle), byteOffset, SEEK_SET);
gzread(gz_handle, rv->GetVoidPointer(0),
gzread(GZFILE(gz_handle), rv->GetVoidPointer(0),
nvals * dataNumComponents * unit_size);
}
else
......@@ -1247,7 +1250,7 @@ avtBOVFileFormat::GetVar(int dom, const char *var)
// Close the file descriptors.
//
if (gzipped)
gzclose(gz_handle);
gzclose(GZFILE(gz_handle));
else
fclose(file_handle);
......@@ -1682,6 +1685,9 @@ avtBOVFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md)
// Hank Childs, Mon Dec 10 16:06:52 PST 2012
// Add support for byte offsets longer than MAX_INT.
//
// Brad Whitlock, Fri Apr 12 15:33:46 PDT 2013
// Fix cast on big endian machines.
//
// ****************************************************************************
template <class T>
......@@ -1739,7 +1745,7 @@ avtBOVFileFormat::ReadTOC(void)
}
#ifdef WORDS_BIGENDIAN
unsigned short tmp;
int16_Reverse_Endian(headerLength, reinterpret_cast<char*>(&tmp));
int16_Reverse_Endian(headerLength, reinterpret_cast<unsigned char*>(&tmp));
headerLength = tmp;
#endif
// headerLength is "unsigned short" and thus always less than or equal 65535
......
......@@ -360,6 +360,10 @@ ResampleGrid(vtkRectilinearGrid *rgrid, float *ptr, float *samples, int numCompo
//
// Mark C. Miller, Sun Dec 16 17:34:17 PST 2012
// Fix potential leak of ptr array on early returns.
//
// Brad Whitlock, Fri Apr 12 15:42:36 PDT 2013
// Use gzFile instead of void* for gz_handle.
//
// ****************************************************************************
void
......@@ -636,7 +640,7 @@ avtBOVWriter::WriteChunk(vtkDataSet *ds, int chunk)
char fmt[1024];
sprintf(fmt, "%s_%%0.%dd.bof.gz", stem.c_str(), numDecimals);
sprintf(str, fmt, brick);
void *gz_handle = gzopen(str, "w");
gzFile gz_handle = gzopen(str, "w");
gzwrite(gz_handle, samples,
vals_per_bricklet*sizeof(float));
gzclose(gz_handle);
......
......@@ -139,6 +139,12 @@
# Added code to only build the paraDIS reader if boost 1.36.0 or later
# was installed on the system.
#
# Brad Whitlock, Fri Apr 19 11:31:21 PDT 2013
# Reorder HDF5-related libraries so static linking will work. For example,
# since Silo depends on HDF5, Silo comes before HDF5 since the
# THIRDPARTY_DEPENDENT_PLUGINS macro appends libraries to long list of
# 3rd party libraries needed for static linking.
#
# Kathleen Biagas, Fri May 3 16:57:29 MST 2013
# Only build the EnSight reader if vtkIOEnSight, upon which it depends,
# is available.
......@@ -193,14 +199,19 @@ ENDMACRO(THIRDPARTY_DEPENDENT_PLUGINS libname targets)
# library are added to the mix.
UNSET(TMP_THIRDPARTY_IO_LIBRARY_DIR)
UNSET(TMP_THIRDPARTY_IO_LIB)
THIRDPARTY_DEPENDENT_PLUGINS(ADIOS ADIOS)
THIRDPARTY_DEPENDENT_PLUGINS(ADVIO Adventure)
THIRDPARTY_DEPENDENT_PLUGINS(BOXLIB Boxlib2D Boxlib3D)
THIRDPARTY_DEPENDENT_PLUGINS(CCMIO CCM)
THIRDPARTY_DEPENDENT_PLUGINS(CFITSIO FITS)
# HDF5-related plugins (HDF5 comes last due to static link order)
IF (NOT WIN32)
THIRDPARTY_DEPENDENT_PLUGINS(SILO Cale KullLite PDB Silo SAMI Vista)
ELSE (NOT WIN32)
THIRDPARTY_DEPENDENT_PLUGINS(SILO Cale KullLite PDB Silo SAMI)
ENDIF (NOT WIN32)
THIRDPARTY_DEPENDENT_PLUGINS(CGNS CGNS)
THIRDPARTY_DEPENDENT_PLUGINS(GDAL GDAL)
THIRDPARTY_DEPENDENT_PLUGINS(HDF4 Cosmos ZeusMP)
THIRDPARTY_DEPENDENT_PLUGINS(FASTBIT H5Part)
THIRDPARTY_DEPENDENT_PLUGINS(H5PART H5Part)
THIRDPARTY_DEPENDENT_PLUGINS(NETCDF NETCDF S3D Exodus )
THIRDPARTY_DEPENDENT_PLUGINS(NETCDF_CXX MFIXCDF)
THIRDPARTY_DEPENDENT_PLUGINS(XDMF Xdmf)
IF(NOT XDMF_FOUND)
SET(XDMF_READER VisItXdmf)
ENDIF(NOT XDMF_FOUND)
......@@ -228,18 +239,17 @@ Velodyne
Vs
${XDMF_READER}
)
# Non-HDF5-related plugins
THIRDPARTY_DEPENDENT_PLUGINS(ADIOS ADIOS)
THIRDPARTY_DEPENDENT_PLUGINS(ADVIO Adventure)
THIRDPARTY_DEPENDENT_PLUGINS(BOXLIB Boxlib2D Boxlib3D)
THIRDPARTY_DEPENDENT_PLUGINS(CCMIO CCM)
THIRDPARTY_DEPENDENT_PLUGINS(CFITSIO FITS)
THIRDPARTY_DEPENDENT_PLUGINS(GDAL GDAL)
THIRDPARTY_DEPENDENT_PLUGINS(HDF4 Cosmos ZeusMP)
THIRDPARTY_DEPENDENT_PLUGINS(MDSPLUS MDSplus)
THIRDPARTY_DEPENDENT_PLUGINS(FASTBIT H5Part)
THIRDPARTY_DEPENDENT_PLUGINS(H5PART H5Part)
THIRDPARTY_DEPENDENT_PLUGINS(MILI Mili)
THIRDPARTY_DEPENDENT_PLUGINS(NETCDF NETCDF S3D Exodus )
THIRDPARTY_DEPENDENT_PLUGINS(NETCDF_CXX MFIXCDF)
IF (NOT WIN32)
THIRDPARTY_DEPENDENT_PLUGINS(SILO Cale KullLite PDB Silo SAMI Vista)
ELSE (NOT WIN32)
THIRDPARTY_DEPENDENT_PLUGINS(SILO Cale KullLite PDB Silo SAMI)
ENDIF (NOT WIN32)
THIRDPARTY_DEPENDENT_PLUGINS(XDMF Xdmf)
IF (WIN32)
THIRDPARTY_DEPENDENT_PLUGINS(ZLIB VCellMTMD)
ENDIF (WIN32)
......@@ -347,12 +357,11 @@ IF (NOT WIN32)
LIST(APPEND REQUIRED_DATABASE_PLUGINS
Claw
STAR
VCellMTMD
Vis5D
ZipWrapper
)
IF(NOT VISIT_STATIC AND NOT VISIT_DBIO_ONLY)
LIST(APPEND REQUIRED_DATABASE_PLUGINS SimV1 SimV1Writer)
LIST(APPEND REQUIRED_DATABASE_PLUGINS VCellMTMD SimV1 SimV1Writer)
ENDIF(NOT VISIT_STATIC AND NOT VISIT_DBIO_ONLY)
SET(OPTIONAL_DATABASE_PLUGINS
Hex
......
......@@ -16048,7 +16048,7 @@ static DBgroupelmap *
GetCondensedGroupelMap(DBfile *dbfile, string mrgtnm_abspath,
DBmrgtnode *rootNode, int forceSingle, int gpel_type)
{
int i,k,q,pass;
int i,k,q = 0,pass;
DBgroupelmap *retval = 0;
// We do this to prevent Silo for re-interpreting integer data in
......
......@@ -57,6 +57,9 @@
# Call ADD_TARGET_DEFINTIONS to add "HAVE_ICET", as the function deals
# correctly with a target already having some COMPILE_DEFINITIONS set.
#
# Brad Whitlock, Thu Apr 11 15:59:49 PDT 2013
# Add check for X11. Change how we get zlib.
#
#****************************************************************************/
SET(LIBENGINE_SOURCES
......@@ -76,9 +79,9 @@ IF(VISIT_STATIC)
SET(ENGINE_STATIC_SOURCES EngineStaticSymbolLocator.C)
ENDIF(VISIT_STATIC)
IF (NOT WIN32 AND NOT APPLE)
IF (NOT WIN32 AND NOT APPLE AND VISIT_USE_X)
SET(LIBENGINE_SOURCES ${LIBENGINE_SOURCES} XDisplay.C)
ENDIF (NOT WIN32 AND NOT APPLE)
ENDIF (NOT WIN32 AND NOT APPLE AND VISIT_USE_X)
IF (NOT WIN32)
# This keeps comm's exceptions visible when using -fvisibility=hidden
ADD_DEFINITIONS(-DCOMM_EXPORTS)
......@@ -182,7 +185,7 @@ TARGET_LINK_LIBRARIES(engine_ser_exe
visit_verdict
vtkjpeg
vtkpng
vtkzlib
${VTKZLIB_LIB}
${VTK_FREETYPE_LIBRARIES}
vtkftgl
${ALL_THIRDPARTY_IO_LIB}
......@@ -266,8 +269,7 @@ IF(VISIT_PARALLEL)
visit_verdict
vtkjpeg
vtkpng
vtkzlib
${Z_LIB}
${VTKZLIB_LIB}
${VTK_FREETYPE_LIBRARIES}
vtkftgl
${ALL_THIRDPARTY_IO_LIB}
......
......@@ -93,7 +93,7 @@
#include <StackTimer.h>
#include <Utility.h>
#include <VisItDisplay.h>
#if !defined(_WIN32) && !defined(__APPLE__)
#if !defined(_WIN32) && !defined(__APPLE__) && defined(HAVE_LIBX11)
# include <XDisplay.h>
#endif
......@@ -3905,7 +3905,7 @@ Engine::SetupDisplay()
#endif
std::string X_Display = RuntimeSetting::lookups("x-display");
std::string disp = display_format(X_Display, PAR_Rank(), display_num);
#if !defined(_WIN32) && !defined(__APPLE__)
#if !defined(_WIN32) && !defined(__APPLE__) && defined(HAVE_LIBX11)
// Tell the display whether or not it should start X servers. This must be
// done before ::Initialize!
XDisplay* xd = dynamic_cast<XDisplay*>(this->renderingDisplay);
......
......@@ -43,7 +43,10 @@
#include <MesaDisplay.h>
#include <snprintf.h>
#include <StringHelpers.h>
#if !defined(_WIN32) && !defined(__APPLE__)
#include <visit-config.h>
#if !defined(_WIN32) && !defined(__APPLE__) && defined(HAVE_LIBX11)
#include <XDisplay.h>
#endif
......@@ -143,7 +146,11 @@ split(std::string str, size_t node, size_t display)
// Tom Fogal, Tue May 25 16:09:02 MDT 2010
// Rename namespace to avoid X conflict.
//
// Brad Whitlock, Fri Apr 12 17:14:37 PDT 2013
// Make conditional on HAVE_LIBX11.
//
// ****************************************************************************
VisItDisplay *
VDisplay::Create(VisItDisplay::DisplayType vtype)
{
......@@ -153,7 +160,7 @@ VDisplay::Create(VisItDisplay::DisplayType vtype)
debug3 << "Creating Mesa (SW-based) display." << std::endl;
return new MesaDisplay();
break;
#if ! defined(_WIN32) && !defined(__APPLE__)
#if ! defined(_WIN32) && !defined(__APPLE__) && defined(HAVE_LIBX11)
case VisItDisplay::D_X:
debug3 << "Creating X (HW-based) display." << std::endl;
return new XDisplay();
......
......@@ -301,7 +301,7 @@ SplashScreen::SplashScreen(bool cyclePictures)
<< tr("October")
<< tr("November")
<< tr("December");
int currentMonth = 3;
int currentMonth = 7;
lLayout->addWidget(new QLabel(versionText, this));
lLayout->addWidget(new QLabel(months[currentMonth-1] + " 2013", this));
......
......@@ -62,6 +62,9 @@
/* Define if you have the OSMESA */
#cmakedefine HAVE_OSMESA
/* Define if you have the X11 library */
#cmakedefine HAVE_LIBX11
/*******************************************************************************
* Header file checks
******************************************************************************/
......
......@@ -119,7 +119,7 @@ TARGET_LINK_LIBRARIES(mdserver
vtkCommonCore
vtkIOCore
vtktiff
vtkzlib
${VTKZLIB_LIB}
vtkpng
vtkjpeg
${ZLIB_LIB}
......
......@@ -193,10 +193,10 @@ avtMoleculeRenderer::Render(vtkDataSet *ds)
delete rendererImplementation;
#ifdef VISIT_MANTA
if (avtCallback::UseManta())
rendererImplementation = new avtMantaMoleculeRenderer;
rendererImplementation = new avtMantaMoleculeRenderer;
else
#endif VISIT_MANTA
rendererImplementation = new avtOpenGLMoleculeRenderer;
#endif
rendererImplementation = new avtOpenGLMoleculeRenderer;
currentRendererIsValid = true;
......
......@@ -310,7 +310,7 @@ bool avtGLSLProgram::IsSupported()
return supported = 0;
return supported =
glewIsSupported( "GL_VERSION_2_0" ) &&
glewIsSupported( "GL_ARB_shading_language_100" );
avt::glew::supported( "GL_VERSION_2_0" ) &&
avt::glew::supported( "GL_ARB_shading_language_100" );
}
......@@ -212,8 +212,8 @@ avtOpenGL3DTextureVolumeRenderer::Render(
{
static bool haveIssuedWarning = false;
if(!(glewIsSupported("GL_VERSION_1_2") ||
glewIsSupported("GL_EXT_texture3D")))
if(!(avt::glew::supported("GL_VERSION_1_2") ||
avt::glew::supported("GL_EXT_texture3D")))
{
if(!haveIssuedWarning)
{
......
......@@ -24,9 +24,7 @@
# CHAOS, x86_64, GCC 4.1.2 aztec.llnl.gov
# SuSE, x86_64, GCC 4.0.2 antares.lbl.gov
# SuSE, x86_64, GCC 4.1.0 octagon.lbl.gov
# MacOSX i386, GCC 4.0.1 corellia.llnl.gov
# MacOSX x86_64 GCC 4.2.1 galvatron.llnl.gov
# MacOSX ppc, GCC 4.0.1 snailbait.llnl.gov
# MacOSX x86_64 GCC 4.2.1 cyclonus.llnl.gov
#
# It is believed that this script will also work with other Linux variations.
# Please send feedback to visit-users@ornl.gov if you run into problems
......
This diff is collapsed.
......@@ -164,9 +164,14 @@ function build_icet
if [[ "$PAR_COMPILER" != "" ]] ; then
if [[ "$OPSYS" == "Darwin" && "$PAR_COMPILER" == "/usr/bin/mpicc" ]]; then
PAR_INCLUDE_STRING="-I/usr/include/"
elif [[ "$OPSYS" == "Linux" && "$PAR_COMPILER" == "mpixlc" ]]; then
PAR_INCLUDE_STRING=`$PAR_COMPILER -show`
else
if [[ -z "$PAR_INCLUDE_STRING" ]]; then
PAR_INCLUDE_STRING=`$PAR_COMPILER --showme:compile`
if [[ $? != 0 ]] ; then
PAR_INCLUDE_STRING=`$PAR_COMPILER -show`
fi
fi
fi
fi
......@@ -188,14 +193,26 @@ function build_icet
# is certainly not ideal -- for example, it will break if the user's
# MPI setup requires multiple include directories.
# split string at space, grab the front/first string in it.
# Search all of the -I directories and take the first one containing mpi.h
PAR_INCLUDE_DIR=""
for arg in $PAR_INCLUDE_STRING ; do
if [[ "$arg" != "${arg#-I}" ]] ; then
PAR_INCLUDE_DIR=${arg#-I}
break
fi
if [[ "$arg" != "${arg#-I}" ]] ; then
if test -e "${arg#-I}/mpi.h" ; then
PAR_INCLUDE_DIR=${arg#-I}
break
fi
fi
done
# If we did not get a valid include directory, take the first -I directory.
if test -z "${PAR_INCLUDE_DIR}" ; then
for arg in $PAR_INCLUDE_STRING ; do
if [[ "$arg" != "${arg#-I}" ]] ; then
PAR_INCLUDE_DIR=${arg#-I}
break
fi
done
fi