Commit 82a4aca0 authored by whitlocb's avatar whitlocb

Fixes for static builds that include GUI components.


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@21094 18c085ea-50e0-402c-830e-de6fd14e8384
parent 198ace63
#/home/brad/Development/thirdparty_shared/cmake/2.8.8/linux-x86_64_gcc-4.4/bin/cmake
IF(WIN32)
MESSAGE(STATUS "Skipping Linux configs")
INCLUDE(config-site/windows.cmake)
ELSE(WIN32)
#/home/brad/Development/thirdparty_shared/2.7.0/cmake/2.8.10.2/linux-x86_64_gcc-4.6/bin/cmake
##
## ./build_visit generated host.cmake
## created: Sat Jun 2 01:11:06 PDT 2012
## system: Linux coruscant 2.6.31-17-generic #54-Ubuntu SMP Thu Dec 10 17:01:44 UTC 2009 x86_64 GNU/Linux
## created: Fri Jun 7 18:54:30 PDT 2013
## system: Linux coruscant 3.2.0-26-generic #41-Ubuntu SMP Thu Jun 14 17:49:24 UTC 2012 x86_64 x86_64 x86_64 GNU/Linux
## by: brad
##
## Setup VISITHOME & VISITARCH variables.
##
SET(VISITHOME /home/brad/Development/thirdparty_shared)
SET(VISITARCH linux-x86_64_gcc-4.6)
IF(VISIT_STATIC)
SET(VISITHOME /home/brad/Development/thirdparty_static/2.7.0)
ELSE(VISIT_STATIC)
SET(VISITHOME /home/brad/Development/thirdparty_shared/2.7.0)
##
## Specify the location of the mesa.
##
VISIT_OPTION_DEFAULT(VISIT_MESA_DIR ${VISITHOME}/mesa/7.8.2/${VISITARCH})
##
## Specify the location of the python.
##
VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR ${VISITHOME}/python/2.6.4/${VISITARCH})
##
## PySide
##
VISIT_OPTION_DEFAULT(VISIT_PYSIDE_DIR ${VISITHOME}/pyside/1.1.1/${VISITARCH}/)
##
## Specify the location of the vtk.
##
VISIT_OPTION_DEFAULT(VISIT_VTK_DIR ${VISITHOME}/vtk/5.8.0.a/${VISITARCH})
##
## Specify the Qt4 binary dir.
## (qmake us used to locate & setup Qt4 dependencies)
##
VISIT_OPTION_DEFAULT(VISIT_QT_BIN ${VISITHOME}/qt/4.8.3/${VISITARCH}/bin)
##
## PySide
##
VISIT_OPTION_DEFAULT(VISIT_PYSIDE_DIR ${VISITHOME}/pyside/1.1.1/${VISITARCH}/)
ENDIF(VISIT_STATIC)
##
## Compiler flags.
##
VISIT_OPTION_DEFAULT(VISIT_C_COMPILER gcc)
VISIT_OPTION_DEFAULT(VISIT_CXX_COMPILER g++)
VISIT_OPTION_DEFAULT(VISIT_FORTRAN_COMPILER gfortran)
VISIT_OPTION_DEFAULT(VISIT_C_FLAGS " -Wno-deprecated -fvisibility=hidden -m64")
VISIT_OPTION_DEFAULT(VISIT_CXX_FLAGS " -Wno-deprecated -fvisibility=hidden -m64")
VISIT_OPTION_DEFAULT(VISIT_FORTRAN ON)
VISIT_OPTION_DEFAULT(VISIT_C_COMPILER gcc TYPE FILEPATH)
VISIT_OPTION_DEFAULT(VISIT_CXX_COMPILER g++ TYPE FILEPATH)
VISIT_OPTION_DEFAULT(VISIT_C_FLAGS " -m64 -fPIC -fvisibility=hidden" TYPE STRING)
VISIT_OPTION_DEFAULT(VISIT_CXX_FLAGS " -m64 -fPIC -fvisibility=hidden" TYPE STRING)
##
## Parallel Build Setup.
......@@ -60,11 +35,6 @@ VISIT_OPTION_DEFAULT(VISIT_PARALLEL ON)
VISIT_OPTION_DEFAULT(VISIT_MPI_COMPILER /usr/bin/mpicxx)
VISIT_OPTION_DEFAULT(VISIT_MPI_FORTRAN_COMPILER /usr/bin/mpif77)
##
## Ice-T
##
#VISIT_OPTION_DEFAULT(VISIT_ICET_DIR ${VISITHOME}/icet/0.5.4/${VISITARCH})
##############################################################
##
## Database reader plugin support libraries
......@@ -76,36 +46,38 @@ VISIT_OPTION_DEFAULT(VISIT_MPI_FORTRAN_COMPILER /usr/bin/mpif77)
## Libraries with LIBDEP settings that depend on other
## Library's LIBDEP settings must come after them.
##############################################################
##
##
## SZIP
## Mesa
##
VISIT_OPTION_DEFAULT(VISIT_SZIP_DIR ${VISITHOME}/szip/2.1/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_MESA_DIR ${VISITHOME}/mesa/7.10.2/${VISITARCH})
##
## HDF4
## Python
##
VISIT_OPTION_DEFAULT(VISIT_HDF4_DIR ${VISITHOME}/hdf4/4.2.5/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_HDF4_LIBDEP ${VISITHOME}/szip/2.1/${VISITARCH}/lib sz /usr/lib/x86_64-linux-gnu jpeg)
VISIT_OPTION_DEFAULT(VISIT_PYTHON_DIR ${VISITHOME}/python/2.7.3/${VISITARCH})
##
## Qt
##
VISIT_OPTION_DEFAULT(VISIT_QT_BIN ${VISITHOME}/qt/4.8.3/${VISITARCH}/bin)
##
## HDF5
## VTK
##
VISIT_OPTION_DEFAULT(VISIT_HDF5_DIR ${VISITHOME}/hdf5/1.8.7/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_HDF5_LIBDEP ${VISITHOME}/szip/2.1/${VISITARCH}/lib sz /usr/lib/x86_64-linux-gnu z)
VISIT_OPTION_DEFAULT(VISIT_VTK_DIR ${VISITHOME}/vtk/6.0.0/${VISITARCH})
##
## NetCDF
## SZIP
##
VISIT_OPTION_DEFAULT(VISIT_NETCDF_DIR ${VISITHOME}/netcdf/4.1.1/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_NETCDF_LIBDEP HDF5_LIBRARY_DIR hdf5_hl HDF5_LIBRARY_DIR hdf5 ${VISIT_HDF5_LIBDEP})
VISIT_OPTION_DEFAULT(VISIT_SZIP_DIR ${VISITHOME}/szip/2.1/${VISITARCH})
##############################################################
##
## Database reader plugin support libraries group 2
## HDF5
##
##############################################################
VISIT_OPTION_DEFAULT(VISIT_HDF5_DIR ${VISITHOME}/hdf5/1.8.7/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_HDF5_LIBDEP ${VISITHOME}/szip/2.1/${VISITARCH}/lib sz /usr/lib/x86_64-linux-gnu z TYPE STRING)
##
## CGNS
......@@ -124,16 +96,32 @@ VISIT_OPTION_DEFAULT(VISIT_GDAL_DIR ${VISITHOME}/gdal/1.7.1/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_H5PART_DIR ${VISITHOME}/h5part/1.6.6/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_H5PART_LIBDEP HDF5_LIBRARY_DIR hdf5 ${VISIT_HDF5_LIBDEP} TYPE STRING)
##
## HDF4
##
VISIT_OPTION_DEFAULT(VISIT_HDF4_DIR ${VISITHOME}/hdf4/4.2.5/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_HDF4_LIBDEP ${VISITHOME}/szip/2.1/${VISITARCH}/lib sz ${VISITHOME}/vtk/6.0.0/${VISITARCH}/lib vtkjpeg-6.0 TYPE STRING)
##
## Ice-T
##
VISIT_OPTION_DEFAULT(VISIT_ICET_DIR ${VISITHOME}/icet/1.0.0/${VISITARCH})
##
## NetCDF
##
#VISIT_OPTION_DEFAULT(VISIT_NETCDF_DIR ${VISITHOME}/netcdf/4.1.1/${VISITARCH})
#VISIT_OPTION_DEFAULT(VISIT_NETCDF_LIBDEP HDF5_LIBRARY_DIR hdf5_hl HDF5_LIBRARY_DIR hdf5 ${VISIT_HDF5_LIBDEP} TYPE STRING)
##
## Silo
##
VISIT_OPTION_DEFAULT(VISIT_SILO_DIR ${VISITHOME}/silo/4.9-pre1/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_SILO_DIR ${VISITHOME}/silo/4.9.1/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_SILO_LIBDEP HDF5_LIBRARY_DIR hdf5 ${VISIT_HDF5_LIBDEP} TYPE STRING)
##
## Xdmf
##
VISIT_OPTION_DEFAULT(VISIT_XDMF_DIR ${VISITHOME}/Xdmf/2.1.1/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_XDMF_LIBDEP HDF5_LIBRARY_DIR hdf5 VTK_LIBRARY_DIRS vtklibxml2 TYPE STRING)
VISIT_OPTION_DEFAULT(VISIT_XDMF_LIBDEP HDF5_LIBRARY_DIR hdf5 VTK_LIBRARY_DIRS vtklibxml2-6.0 TYPE STRING)
ENDIF(WIN32)
......@@ -65,9 +65,9 @@ Viewer.h
QT_WRAP_CPP(clipeditor CLIPEDITOR_SOURCES ${CLIPEDITOR_MOC_SOURCES})
SET(RELEVANT_QT_LIBS
${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY}
${QT_QTOPENGL_LIBRARY}
${QT_QTGUI_LIBRARY}
${QT_QTCORE_LIBRARY}
)
IF(VISIT_STATIC)
MAC_NIB_INSTALL(clipeditor)
......
......@@ -50,6 +50,9 @@
# Eric Brugger, Wed Apr 17 12:02:02 PDT 2013
# Create a linux version of qtssh.
#
# Brad Whitlock, Fri Jun 7 22:03:52 PDT 2013
# Static build fixes.
#
#****************************************************************************/
# All of the platform independent plink sources.
......@@ -191,8 +194,21 @@ IF(WIN32)
ADD_DEFINITIONS(-DSECURITY_WIN32)
ENDIF(WIN32)
SET(RELEVANT_QT_LIBS
${QT_QTGUI_LIBRARY}
${QT_QTCORE_LIBRARY}
)
IF(VISIT_STATIC)
MAC_NIB_INSTALL(qtssh)
SET(RELEVANT_QT_LIBS
${RELEVANT_QT_LIBS}
${QT_QTCORE_LIB_DEPENDENCIES}
${QT_QTGUI_LIB_DEPENDENCIES}
)
ENDIF(VISIT_STATIC)
ADD_EXECUTABLE(qtssh ${QTSSH_SOURCES} ${PLINK_SOURCES})
TARGET_LINK_LIBRARIES(qtssh ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
TARGET_LINK_LIBRARIES(qtssh ${RELEVANT_QT_LIBS})
VISIT_INSTALL_TARGETS(qtssh)
VISIT_TOOLS_ADD_FOLDER(qtssh)
......
......@@ -685,6 +685,7 @@ int vtkOSMesaGLExtensionManager::SafeLoadExtension(const char *name)
return result;
}
#ifndef VISIT_STATIC
// Those two functions are part of OpenGL2.0 but don't have direct
// translation in the GL_ARB_shader_objects extension
GLboolean IsProgramFromARBToPromoted(GLuint program)
......@@ -1336,3 +1337,4 @@ int vtkgl::LoadAsARBExtension(const char *name,
}
return 0;
}
#endif
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