Commit a127fc51 authored by whitlocb's avatar whitlocb
Browse files

Fix engine-only and server-components-only builds.



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@17519 18c085ea-50e0-402c-830e-de6fd14e8384
parent 7d56a358
......@@ -857,17 +857,17 @@ IF(VISIT_PYTHON_FILTERS AND VISIT_DBIO_ONLY)
ENDIF(VISIT_PYTHON_FILTERS AND VISIT_DBIO_ONLY)
# Configure Qt4 support.
IF(NOT VISIT_DBIO_ONLY)
IF(NOT VISIT_DBIO_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_SERVER_COMPONENTS_ONLY)
INCLUDE(${VISIT_SOURCE_DIR}/CMake/FindVisItQt4.cmake)
ENDIF(NOT VISIT_DBIO_ONLY)
ENDIF(NOT VISIT_DBIO_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_SERVER_COMPONENTS_ONLY)
# Configure PySide Support
IF(NOT VISIT_DBIO_ONLY)
IF(NOT VISIT_DBIO_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_SERVER_COMPONENTS_ONLY)
INCLUDE(${VISIT_SOURCE_DIR}/CMake/FindPySide.cmake)
IF(PYSIDE_FOUND)
SET(HAVE_PYSIDE 1)
ENDIF(PYSIDE_FOUND)
ENDIF(NOT VISIT_DBIO_ONLY)
ENDIF(NOT VISIT_DBIO_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_SERVER_COMPONENTS_ONLY)
# Treat GLEW as a 3rd party builtin.
SET(GLEW_FOUND 1)
......@@ -1766,6 +1766,7 @@ ADD_SUBDIRECTORY(third_party_builtin)
ADD_SUBDIRECTORY(common)
ADD_SUBDIRECTORY(visit_vtk)
ADD_SUBDIRECTORY(avt)
ADD_SUBDIRECTORY(sim)
IF(VISIT_DBIO_ONLY)
ADD_SUBDIRECTORY(tools)
ELSE(VISIT_DBIO_ONLY)
......@@ -1774,7 +1775,6 @@ ENDIF(VISIT_DBIO_ONLY)
IF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_SUBDIRECTORY(launcher)
ADD_SUBDIRECTORY(mdserver)
ADD_SUBDIRECTORY(sim)
ENDIF(NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_SUBDIRECTORY(vtkqt)
......
......@@ -149,12 +149,12 @@ LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY} ${VTK_LIBRARY_DIRS} ${MESA_LIBRARY_
#********************************* SERIAL ************************************
ADD_LIBRARY(avtplotter_ser ${AVTPLOTTER_SOURCES})
TARGET_LINK_LIBRARIES(avtplotter_ser visitcommon avtmath avtview avtfilters_ser avtpipeline_ser visit_vtk lightweight_visit_vtk vtkHybrid ${GLEW_LIB} ${MESA_LIB})
TARGET_LINK_LIBRARIES(avtplotter_ser visitcommon avtmath avtview avtfilters_ser avtpipeline_ser visit_vtk lightweight_visit_vtk vtkHybrid ${GLEW_LIB})
VISIT_INSTALL_TARGETS(avtplotter_ser)
#********************************* PARALLEL **********************************
IF(VISIT_PARALLEL)
ADD_PARALLEL_LIBRARY(avtplotter_par ${AVTPLOTTER_SOURCES})
TARGET_LINK_LIBRARIES(avtplotter_par visitcommon avtmath avtview avtfilters_par avtpipeline_par visit_vtk lightweight_visit_vtk vtkHybrid ${GLEW_LIB} ${MESA_LIB})
TARGET_LINK_LIBRARIES(avtplotter_par visitcommon avtmath avtview avtfilters_par avtpipeline_par visit_vtk lightweight_visit_vtk vtkHybrid ${GLEW_LIB})
VISIT_INSTALL_TARGETS(avtplotter_par)
ENDIF(VISIT_PARALLEL)
......@@ -29,6 +29,8 @@ list of changes in release 2.4.1.</p>
<li>An angle conversion in the Cylinder operator was fixed so the operator works again.</li>
<li>Axis titles and text annotations are no longer sometimes truncated when drawn.</li>
<li>VisIt no longer crashes when plotting 1D and 2D plots whose axes have been set explicitly to generate tick marks that are outside a dataset's spatial extents.</li>
<li>The <i>VISIT_ENGINE_ONLY</i> build mode, which builds only the VisIt compute engine and its plugins, works again.</i>
<li>The <i>VISIT_SERVER_COMPONENTS_ONLY</i> build mode, which builds only the VisIt compute engine, metadata server, launcher, and their plugins works again.</li>
</ul>
<p><b><font size="4">Enhancements in version 2.4.2</font></b></p>
......
......@@ -21,7 +21,6 @@ ${COMMON_SOURCES}
SET(LIBG_MOC_SOURCES
QvisAMRStitchCellWindow.h
)
QT_WRAP_CPP(GAMRStitchCellOperator LIBG_SOURCES ${LIBG_MOC_SOURCES})
SET(LIBV_SOURCES
AMRStitchCellViewerPluginInfo.C
......@@ -95,6 +94,7 @@ TARGET_LINK_LIBRARIES(IAMRStitchCellOperator visitcommon)
SET(INSTALLTARGETS IAMRStitchCellOperator)
IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
QT_WRAP_CPP(GAMRStitchCellOperator LIBG_SOURCES ${LIBG_MOC_SOURCES})
ADD_LIBRARY(GAMRStitchCellOperator ${LIBG_SOURCES})
TARGET_LINK_LIBRARIES(GAMRStitchCellOperator visitcommon gui )
......
......@@ -21,7 +21,6 @@ ${COMMON_SOURCES}
SET(LIBG_MOC_SOURCES
QvisBoundaryOpWindow.h
)
QT_WRAP_CPP(GBoundaryOpOperator LIBG_SOURCES ${LIBG_MOC_SOURCES})
SET(LIBV_SOURCES
BoundaryOpViewerPluginInfo.C
......@@ -92,6 +91,7 @@ TARGET_LINK_LIBRARIES(IBoundaryOpOperator visitcommon)
SET(INSTALLTARGETS IBoundaryOpOperator)
IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
QT_WRAP_CPP(GBoundaryOpOperator LIBG_SOURCES ${LIBG_MOC_SOURCES})
ADD_LIBRARY(GBoundaryOpOperator ${LIBG_SOURCES})
TARGET_LINK_LIBRARIES(GBoundaryOpOperator visitcommon gui )
......
......@@ -21,7 +21,6 @@ ${COMMON_SOURCES}
SET(LIBG_MOC_SOURCES
QvisBoxWindow.h
)
QT_WRAP_CPP(GBoxOperator LIBG_SOURCES ${LIBG_MOC_SOURCES})
SET(LIBV_SOURCES
BoxViewerPluginInfo.C
......@@ -92,6 +91,7 @@ TARGET_LINK_LIBRARIES(IBoxOperator visitcommon)
SET(INSTALLTARGETS IBoxOperator)
IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
QT_WRAP_CPP(GBoxOperator LIBG_SOURCES ${LIBG_MOC_SOURCES})
ADD_LIBRARY(GBoxOperator ${LIBG_SOURCES})
TARGET_LINK_LIBRARIES(GBoxOperator visitcommon gui )
......
......@@ -21,7 +21,6 @@ ${COMMON_SOURCES}
SET(LIBG_MOC_SOURCES
QvisChannelCommWindow.h
)
QT_WRAP_CPP(GChannelCommOperator LIBG_SOURCES ${LIBG_MOC_SOURCES})
SET(LIBV_SOURCES
ChannelCommViewerPluginInfo.C
......@@ -92,6 +91,7 @@ TARGET_LINK_LIBRARIES(IChannelCommOperator visitcommon)
SET(INSTALLTARGETS IChannelCommOperator)
IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
QT_WRAP_CPP(GChannelCommOperator LIBG_SOURCES ${LIBG_MOC_SOURCES})
ADD_LIBRARY(GChannelCommOperator ${LIBG_SOURCES})
TARGET_LINK_LIBRARIES(GChannelCommOperator visitcommon gui )
......
......@@ -21,7 +21,6 @@ ${COMMON_SOURCES}
SET(LIBG_MOC_SOURCES
QvisClipWindow.h
)
QT_WRAP_CPP(GClipOperator LIBG_SOURCES ${LIBG_MOC_SOURCES})
SET(LIBV_SOURCES
ClipViewerPluginInfo.C
......@@ -92,6 +91,7 @@ TARGET_LINK_LIBRARIES(IClipOperator visitcommon)
SET(INSTALLTARGETS IClipOperator)
IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
QT_WRAP_CPP(GClipOperator LIBG_SOURCES ${LIBG_MOC_SOURCES})
ADD_LIBRARY(GClipOperator ${LIBG_SOURCES})
TARGET_LINK_LIBRARIES(GClipOperator visitcommon gui )
......
......@@ -21,7 +21,6 @@ ${COMMON_SOURCES}
SET(LIBG_MOC_SOURCES
QvisConeWindow.h
)
QT_WRAP_CPP(GConeOperator LIBG_SOURCES ${LIBG_MOC_SOURCES})
SET(LIBV_SOURCES
ConeViewerPluginInfo.C
......@@ -92,6 +91,7 @@ TARGET_LINK_LIBRARIES(IConeOperator visitcommon)
SET(INSTALLTARGETS IConeOperator)
IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
QT_WRAP_CPP(GConeOperator LIBG_SOURCES ${LIBG_MOC_SOURCES})
ADD_LIBRARY(GConeOperator ${LIBG_SOURCES})
TARGET_LINK_LIBRARIES(GConeOperator visitcommon gui )
......
......@@ -21,7 +21,6 @@ ${COMMON_SOURCES}
SET(LIBG_MOC_SOURCES
QvisConnCompReduceWindow.h
)
QT_WRAP_CPP(GConnCompReduceOperator LIBG_SOURCES ${LIBG_MOC_SOURCES})
SET(LIBV_SOURCES
ConnCompReduceViewerPluginInfo.C
......@@ -92,6 +91,7 @@ TARGET_LINK_LIBRARIES(IConnCompReduceOperator visitcommon)
SET(INSTALLTARGETS IConnCompReduceOperator)
IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
QT_WRAP_CPP(GConnCompReduceOperator LIBG_SOURCES ${LIBG_MOC_SOURCES})
ADD_LIBRARY(GConnCompReduceOperator ${LIBG_SOURCES})
TARGET_LINK_LIBRARIES(GConnCompReduceOperator visitcommon gui )
......
......@@ -21,7 +21,6 @@ ${COMMON_SOURCES}
SET(LIBG_MOC_SOURCES
QvisConnectedComponentsWindow.h
)
QT_WRAP_CPP(GConnectedComponentsOperator LIBG_SOURCES ${LIBG_MOC_SOURCES})
SET(LIBV_SOURCES
ConnectedComponentsViewerPluginInfo.C
......@@ -92,6 +91,7 @@ TARGET_LINK_LIBRARIES(IConnectedComponentsOperator visitcommon)
SET(INSTALLTARGETS IConnectedComponentsOperator)
IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
QT_WRAP_CPP(GConnectedComponentsOperator LIBG_SOURCES ${LIBG_MOC_SOURCES})
ADD_LIBRARY(GConnectedComponentsOperator ${LIBG_SOURCES})
TARGET_LINK_LIBRARIES(GConnectedComponentsOperator visitcommon gui )
......
......@@ -21,7 +21,6 @@ ${COMMON_SOURCES}
SET(LIBG_MOC_SOURCES
QvisContextWindow.h
)
QT_WRAP_CPP(GContextOperator LIBG_SOURCES ${LIBG_MOC_SOURCES})
SET(LIBV_SOURCES
ContextViewerPluginInfo.C
......@@ -92,6 +91,7 @@ TARGET_LINK_LIBRARIES(IContextOperator visitcommon)
SET(INSTALLTARGETS IContextOperator)
IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
QT_WRAP_CPP(GContextOperator LIBG_SOURCES ${LIBG_MOC_SOURCES})
ADD_LIBRARY(GContextOperator ${LIBG_SOURCES})
TARGET_LINK_LIBRARIES(GContextOperator visitcommon gui )
......
......@@ -21,7 +21,6 @@ ${COMMON_SOURCES}
SET(LIBG_MOC_SOURCES
QvisCoordSwapWindow.h
)
QT_WRAP_CPP(GCoordSwapOperator LIBG_SOURCES ${LIBG_MOC_SOURCES})
SET(LIBV_SOURCES
CoordSwapViewerPluginInfo.C
......@@ -92,6 +91,7 @@ TARGET_LINK_LIBRARIES(ICoordSwapOperator visitcommon)
SET(INSTALLTARGETS ICoordSwapOperator)
IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
QT_WRAP_CPP(GCoordSwapOperator LIBG_SOURCES ${LIBG_MOC_SOURCES})
ADD_LIBRARY(GCoordSwapOperator ${LIBG_SOURCES})
TARGET_LINK_LIBRARIES(GCoordSwapOperator visitcommon gui )
......
......@@ -21,7 +21,6 @@ ${COMMON_SOURCES}
SET(LIBG_MOC_SOURCES
QvisCracksClipperWindow.h
)
QT_WRAP_CPP(GCracksClipperOperator LIBG_SOURCES ${LIBG_MOC_SOURCES})
SET(LIBV_SOURCES
CracksClipperViewerPluginInfo.C
......@@ -101,6 +100,7 @@ TARGET_LINK_LIBRARIES(ICracksClipperOperator visitcommon)
SET(INSTALLTARGETS ICracksClipperOperator)
IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
QT_WRAP_CPP(GCracksClipperOperator LIBG_SOURCES ${LIBG_MOC_SOURCES})
ADD_LIBRARY(GCracksClipperOperator ${LIBG_SOURCES})
TARGET_LINK_LIBRARIES(GCracksClipperOperator visitcommon gui )
......
......@@ -21,7 +21,6 @@ ${COMMON_SOURCES}
SET(LIBG_MOC_SOURCES
QvisCreateBondsWindow.h
)
QT_WRAP_CPP(GCreateBondsOperator LIBG_SOURCES ${LIBG_MOC_SOURCES})
SET(LIBV_SOURCES
CreateBondsViewerPluginInfo.C
......@@ -92,6 +91,7 @@ TARGET_LINK_LIBRARIES(ICreateBondsOperator visitcommon)
SET(INSTALLTARGETS ICreateBondsOperator)
IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
QT_WRAP_CPP(GCreateBondsOperator LIBG_SOURCES ${LIBG_MOC_SOURCES})
ADD_LIBRARY(GCreateBondsOperator ${LIBG_SOURCES})
TARGET_LINK_LIBRARIES(GCreateBondsOperator visitcommon gui )
......
......@@ -21,7 +21,6 @@ ${COMMON_SOURCES}
SET(LIBG_MOC_SOURCES
QvisCylinderWindow.h
)
QT_WRAP_CPP(GCylinderOperator LIBG_SOURCES ${LIBG_MOC_SOURCES})
SET(LIBV_SOURCES
CylinderViewerPluginInfo.C
......@@ -92,6 +91,7 @@ TARGET_LINK_LIBRARIES(ICylinderOperator visitcommon)
SET(INSTALLTARGETS ICylinderOperator)
IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
QT_WRAP_CPP(GCylinderOperator LIBG_SOURCES ${LIBG_MOC_SOURCES})
ADD_LIBRARY(GCylinderOperator ${LIBG_SOURCES})
TARGET_LINK_LIBRARIES(GCylinderOperator visitcommon gui )
......
......@@ -21,7 +21,6 @@ ${COMMON_SOURCES}
SET(LIBG_MOC_SOURCES
QvisDataBinningWindow.h
)
QT_WRAP_CPP(GDataBinningOperator LIBG_SOURCES ${LIBG_MOC_SOURCES})
SET(LIBV_SOURCES
DataBinningViewerPluginInfo.C
......@@ -93,6 +92,7 @@ TARGET_LINK_LIBRARIES(IDataBinningOperator visitcommon)
SET(INSTALLTARGETS IDataBinningOperator)
IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
QT_WRAP_CPP(GDataBinningOperator LIBG_SOURCES ${LIBG_MOC_SOURCES})
ADD_LIBRARY(GDataBinningOperator ${LIBG_SOURCES})
TARGET_LINK_LIBRARIES(GDataBinningOperator visitcommon gui )
......
......@@ -21,7 +21,6 @@ ${COMMON_SOURCES}
SET(LIBG_MOC_SOURCES
QvisDecimateWindow.h
)
QT_WRAP_CPP(GDecimateOperator LIBG_SOURCES ${LIBG_MOC_SOURCES})
SET(LIBV_SOURCES
DecimateViewerPluginInfo.C
......@@ -92,6 +91,7 @@ TARGET_LINK_LIBRARIES(IDecimateOperator visitcommon)
SET(INSTALLTARGETS IDecimateOperator)
IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
QT_WRAP_CPP(GDecimateOperator LIBG_SOURCES ${LIBG_MOC_SOURCES})
ADD_LIBRARY(GDecimateOperator ${LIBG_SOURCES})
TARGET_LINK_LIBRARIES(GDecimateOperator visitcommon gui )
......
......@@ -21,7 +21,6 @@ ${COMMON_SOURCES}
SET(LIBG_MOC_SOURCES
QvisDeferExpressionWindow.h
)
QT_WRAP_CPP(GDeferExpressionOperator LIBG_SOURCES ${LIBG_MOC_SOURCES})
SET(LIBV_SOURCES
DeferExpressionViewerPluginInfo.C
......@@ -92,6 +91,7 @@ TARGET_LINK_LIBRARIES(IDeferExpressionOperator visitcommon)
SET(INSTALLTARGETS IDeferExpressionOperator)
IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
QT_WRAP_CPP(GDeferExpressionOperator LIBG_SOURCES ${LIBG_MOC_SOURCES})
ADD_LIBRARY(GDeferExpressionOperator ${LIBG_SOURCES})
TARGET_LINK_LIBRARIES(GDeferExpressionOperator visitcommon gui )
......
......@@ -21,7 +21,6 @@ ${COMMON_SOURCES}
SET(LIBG_MOC_SOURCES
QvisDeformSphereGlyphWindow.h
)
QT_WRAP_CPP(GDeformSphereGlyphOperator LIBG_SOURCES ${LIBG_MOC_SOURCES})
SET(LIBV_SOURCES
DeformSphereGlyphViewerPluginInfo.C
......@@ -92,6 +91,7 @@ TARGET_LINK_LIBRARIES(IDeformSphereGlyphOperator visitcommon)
SET(INSTALLTARGETS IDeformSphereGlyphOperator)
IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
QT_WRAP_CPP(GDeformSphereGlyphOperator LIBG_SOURCES ${LIBG_MOC_SOURCES})
ADD_LIBRARY(GDeformSphereGlyphOperator ${LIBG_SOURCES})
TARGET_LINK_LIBRARIES(GDeformSphereGlyphOperator visitcommon gui )
......
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