From f302f3a52330b2d2aae268ab9a7afab202794854 Mon Sep 17 00:00:00 2001 From: Kathleen Biagas Date: Fri, 27 Dec 2024 10:40:20 -0800 Subject: [PATCH 1/3] Add function visit_add_operator_plugin. Update GenerateCMake, run on operators to update CMakeLists.txt. --- src/CMake/PluginMacros.cmake | 455 ++++++++++++++++++ .../Database/Database/avtGenericDatabase.C | 176 ++++--- src/avt/Database/Formats/avtFileFormat.C | 35 +- .../Ghost/avtStructuredDomainBoundaries.C | 190 ++++---- .../Ghost/avtUnstructuredDomainBoundaries.C | 292 ++++++----- .../Abstract/avtExpressionDataTreeIterator.C | 1 + src/avt/Filters/avtContourFilter.C | 1 + src/avt/Filters/avtThresholdFilter.C | 1 + src/operators/AMRStitchCell/AMRStitchCell.xml | 4 - src/operators/AMRStitchCell/CMakeLists.txt | 96 +--- .../AxisAlignedSlice4D/CMakeLists.txt | 91 +--- src/operators/BoundaryOp/CMakeLists.txt | 91 +--- src/operators/Box/CMakeLists.txt | 91 +--- .../CartographicProjection/CMakeLists.txt | 99 +--- src/operators/Clip/CMakeLists.txt | 91 +--- src/operators/Cone/CMakeLists.txt | 91 +--- src/operators/ConnCompReduce/CMakeLists.txt | 91 +--- .../ConnectedComponents/CMakeLists.txt | 91 +--- src/operators/Context/CMakeLists.txt | 91 +--- src/operators/CoordSwap/CMakeLists.txt | 91 +--- src/operators/CracksClipper/CMakeLists.txt | 106 +--- src/operators/CracksClipper/CracksClipper.xml | 8 - src/operators/CreateBonds/CMakeLists.txt | 91 +--- src/operators/Cylinder/CMakeLists.txt | 91 +--- src/operators/DataBinning/CMakeLists.txt | 92 +--- src/operators/DataBinning/DataBinning.xml | 3 - src/operators/Decimate/CMakeLists.txt | 91 +--- src/operators/DeferExpression/CMakeLists.txt | 91 +--- src/operators/Delaunay/CMakeLists.txt | 91 +--- src/operators/Displace/CMakeLists.txt | 91 +--- src/operators/Displace/Displace.xml | 3 - src/operators/DualMesh/CMakeLists.txt | 91 +--- src/operators/Edge/CMakeLists.txt | 91 +--- src/operators/Elevate/CMakeLists.txt | 91 +--- src/operators/EllipsoidSlice/CMakeLists.txt | 91 +--- src/operators/Explode/CMakeLists.txt | 91 +--- src/operators/ExternalSurface/CMakeLists.txt | 91 +--- .../ExtractPointFunction2D/CMakeLists.txt | 91 +--- src/operators/Extrude/CMakeLists.txt | 91 +--- src/operators/ExtrudeStacked/CMakeLists.txt | 91 +--- src/operators/FFT/CMakeLists.txt | 91 +--- .../FiveFoldTetSubdivision/CMakeLists.txt | 91 +--- src/operators/Flux/CMakeLists.txt | 91 +--- src/operators/IndexSelect/CMakeLists.txt | 91 +--- src/operators/IntegralCurve/CMakeLists.txt | 93 +--- src/operators/IntegralCurve/IntegralCurve.xml | 11 - src/operators/InverseGhostZone/CMakeLists.txt | 91 +--- src/operators/Isosurface/CMakeLists.txt | 91 +--- src/operators/Isovolume/CMakeLists.txt | 100 +--- src/operators/Isovolume/Isovolume.xml | 3 - src/operators/Isovolume/avtIsovolumeFilter.C | 1 + src/operators/LCS/CMakeLists.txt | 97 +--- src/operators/LCS/LCS.xml | 1 - src/operators/Lagrangian/CMakeLists.txt | 93 +--- src/operators/LimitCycle/CMakeLists.txt | 93 +--- src/operators/LimitCycle/LimitCycle.xml | 11 - src/operators/LineSampler/CMakeLists.txt | 91 +--- src/operators/LineSampler/LineSampler.xml | 2 - src/operators/Lineout/CMakeLists.txt | 91 +--- src/operators/Lineout/Lineout.xml | 3 - src/operators/Merge/CMakeLists.txt | 91 +--- src/operators/MetricThreshold/CMakeLists.txt | 91 +--- src/operators/ModelFit/CMakeLists.txt | 91 +--- src/operators/MultiresControl/CMakeLists.txt | 92 +--- .../MultiresControl/MultiresControl.xml | 3 - src/operators/OnionPeel/CMakeLists.txt | 91 +--- src/operators/PDF/CMakeLists.txt | 91 +--- .../PersistentParticles/CMakeLists.txt | 91 +--- src/operators/Poincare/CMakeLists.txt | 101 +--- src/operators/Poincare/Poincare.xml | 3 - src/operators/Project/CMakeLists.txt | 91 +--- src/operators/RadialResample/CMakeLists.txt | 93 +--- src/operators/Reflect/CMakeLists.txt | 93 +--- src/operators/Reflect/Reflect.xml | 3 - src/operators/Remap/CMakeLists.txt | 92 +--- src/operators/Remap/Remap.xml | 3 - src/operators/RemoveCells/CMakeLists.txt | 91 +--- src/operators/Replicate/CMakeLists.txt | 91 +--- src/operators/Resample/CMakeLists.txt | 91 +--- src/operators/Resample/Resample.xml | 3 - src/operators/Revolve/CMakeLists.txt | 91 +--- src/operators/SPHResample/CMakeLists.txt | 91 +--- src/operators/Slice/CMakeLists.txt | 99 +--- src/operators/Slice/Slice.xml | 3 - src/operators/Slice/SliceAttributes.code | 10 +- src/operators/Slice/avtSliceFilter.C | 1 + src/operators/Smooth/CMakeLists.txt | 91 +--- src/operators/SphereSlice/CMakeLists.txt | 91 +--- src/operators/Stagger/CMakeLists.txt | 91 +--- .../StatisticalTrends/CMakeLists.txt | 91 +--- src/operators/SubdivideQuads/CMakeLists.txt | 91 +--- src/operators/SurfCompPrep/CMakeLists.txt | 91 +--- src/operators/SurfaceNormal/CMakeLists.txt | 91 +--- src/operators/Tessellate/CMakeLists.txt | 91 +--- src/operators/ThreeSlice/CMakeLists.txt | 91 +--- src/operators/Threshold/CMakeLists.txt | 91 +--- src/operators/Threshold/Threshold.xml | 3 - .../ToroidalPoloidalProjection/CMakeLists.txt | 91 +--- src/operators/Transform/CMakeLists.txt | 91 +--- .../TriangulateRegularPoints/CMakeLists.txt | 91 +--- src/operators/Tube/CMakeLists.txt | 91 +--- src/operators/ZoneDump/CMakeLists.txt | 91 +--- src/tools/dev/xml/GenerateCMake.h | 115 +++++ src/visitpy/common/visitmodule.C | 2 +- 104 files changed, 1254 insertions(+), 6904 deletions(-) diff --git a/src/CMake/PluginMacros.cmake b/src/CMake/PluginMacros.cmake index 21fe289cc71..fae5de6e4f5 100644 --- a/src/CMake/PluginMacros.cmake +++ b/src/CMake/PluginMacros.cmake @@ -229,3 +229,458 @@ function(CREATE_PLUGIN_DEPENDENCIES target comp type) #message("${cachevar} = ${${cachevar}}") endfunction(CREATE_PLUGIN_DEPENDENCIES) +function(visit_add_plot_plugin) + # required arguments: + # PNAME Name of the plot plugin + # optional arguments: + # GSRC additional sources for the gui target + # VSRC additional sources for the viewer target + # ESRC additional sources for the engine targets + # GLIBS additional libraries for the gui target + # VLIBS additional libraries for the viewer target + # SLIBS additional libraries for the scripting target + # ESERLIBS additional libraries for the serial engine targets + # EPARLIBS additional libraries for the parallel engine targets + # DEFINES any defines for viewer,engine targets + # DISABLE_AUTOGEN disable xml autogeneration + + + # NOTES: not all of the target link libraries being added to the + # targets here are necessary for every plot. They are being added + # for convenience to ease plugin developement + + set(OPTS DISABLE_AUTOGEN) + set(VALS PNAME) + set(MVALS GSRC VSRC ESRC GLIBS VLIBS SLIBS ESERLIBS EPARLIBS DEFINES) + cmake_parse_arguments(plot "${OPTS}" "${VALS}" "${MVALS}" ${ARGN}) + + if(NOT DEFINED plot_PNAME) + message(FATAL_ERROR "Incomplete arguments to visit_add_plot_plugin. Required: PNAME") + endif() + + project(${plot_PNAME}_plot) + + # if doing dev build ?? + if(NOT ${plot_DISABLE_AUTOGEN}) + ADD_PLOT_CODE_GEN_TARGETS(${plot_PNAME}) + endif() + + set(CATTS ${plot_PNAME}Attributes) + set(PYATTS Py${plot_PNAME}Attributes) + set(JATTS ${plot_PNAME}Attributes.java) + set(COMMON_SOURCES + ${plot_PNAME}PluginInfo.C + ${plot_PNAME}CommonPluginInfo.C + ${CATTS}.C) + set(COMMON_HEADERS + ${plot_PNAME}PluginInfo.h + ${CATTS}.h) + + set(LIBI_SOURCES ${plot_PNAME}PluginInfo.C) + set(LIBI_HEADERS ${plot_PNAME}PluginInfo.h) + + set(LIBG_SOURCES + ${plot_PNAME}GUIPluginInfo.C + Qvis${plot_PNAME}PlotWindow.C + ${COMMON_SOURCES}) + set(LIBG_HEADERS + Qvis${plot_PNAME}PlotWindow.h + ${COMMON_HEADERS}) + if(DEFINED plot_GSRC) + list(APPEND LIBG_SOURCES ${plot_GSRC}) + foreach(src ${plot_GSRC}) + string(REPLACE ".C" ".h" hdr ${src}) + list(APPEND LIBG_HEADERS ${hdr}) + endforeach() + endif() + + set(LIBV_SOURCES + ${plot_PNAME}ViewerEnginePluginInfo.C + ${plot_PNAME}ViewerPluginInfo.C + avt${plot_PNAME}Plot.C + ${COMMON_SOURCES}) + set(LIBV_HEADERS + avt${plot_PNAME}Plot.h + ${COMMON_HEADERS}) + + if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/avt${plot_PNAME}Filter.C) + list(APPEND LIBV_SOURCES avt${plot_PNAME}Filter.C) + list(APPEND LIBV_HEADERS avt${plot_PNAME}Filter.h) + endif() + + if(DEFINED plot_VSRC) + list(APPEND LIBV_SOURCES ${plot_VSRC}) + foreach(src ${plot_VSRC}) + string(REPLACE ".C" ".h" src hdr) + list(APPEND LIBV_HEADERS ${hdr}) + endforeach() + endif() + + set(LIBE_SOURCES + ${plot_PNAME}ViewerEnginePluginInfo.C + ${plot_PNAME}EnginePluginInfo.C + avt${plot_PNAME}Plot.C + ${COMMON_SOURCES}) + set(LIBE_HEADERS + avt${plot_PNAME}Plot.h + ${COMMON_HEADERS}) + + if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/avt${plot_PNAME}Filter.C) + list(APPEND LIBE_SOURCES avt${plot_PNAME}Filter.C) + list(APPEND LIBE_HEADERS avt${plot_PNAME}Filter.h) + endif() + + if(DEFINED plot_ESRC) + list(APPEND LIBE_SOURCES ${plot_ESRC}) + foreach(src ${plot_ESRC}) + string(REPLACE ".C" ".h" src hdr) + list(APPEND LIBE_HEADERS ${hdr}) + endforeach() + endif() + + set(ITarget I${plot_PNAME}Plot) + set(GTarget G${plot_PNAME}Plot) + set(VTarget V${plot_PNAME}Plot) + set(STarget S${plot_PNAME}Plot) + set(ESerTarget E${plot_PNAME}Plot_ser) + set(EParTarget E${plot_PNAME}Plot_par) + + # we are setting SKIP_INSTALL for all visit_add_library calls + # because plugins don't need to be installed via the export-targets + # install path. Will use standard install logic at end of the method. + visit_add_library( + NAME ${ITarget} + SOURCES ${LIBI_SOURCES} + HEADERS ${LIBI_HEADERS} + INCLUDES $ + DEPENDS_ON visitcommon + SKIP_INSTALL) + + set(INSTALLTARGETS ${ITarget}) + + if(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) + visit_add_library( + NAME ${GTarget} + SOURCES ${LIBG_SOURCES} + HEADERS ${LIBG_HEADERS} + INCLUDES $ + DEPENDS_ON visitcommon gui ${plot_GLIBS} + SKIP_INSTALL) + + set_target_properties(${GTarget} PROPERTIES AUTOMOC ON) + + visit_add_library( + NAME ${VTarget} + SOURCES ${LIBV_SOURCES} + HEADERS ${LIBV_HEADERS} + INCLUDES $ + DEFINES VIEWER ${plot_DEFINES} + DEPENDS_ON visitcommon viewer ${plot_VLIBS} + SKIP_INSTALL) + + set_target_properties(${VTarget} PROPERTIES AUTOMOC ON) + + if(QT_VERSION VERSION_GREATER_EQUAL "6.2.0") + qt6_disable_unicode_defines(${GTarget}) + qt6_disable_unicode_defines(${VTarget}) + endif() + + list(APPEND INSTALLTARGETS ${GTarget} ${VTarget}) + + if(VISIT_PYTHON_SCRIPTING) + visit_add_library( + NAME ${STarget} + SOURCES ${plot_PNAME}ScriptingPluginInfo.C + ${PYATTS}.C + ${COMMON_SOURCES} + HEADERS ${PYATTS}.h + ${COMMON_HEADERS} + INCLUDES $ + $ + DEPENDS_ON visitcommon visitpy ${PYTHON_LIBRARY} ${plot_SLIBS} + SKIP_INSTALL) + + if(WIN32) + # This prevents python from #defining snprintf as _snprintf + target_compile_definitions(${STarget} PRIVATE HAVE_SNPRINTF) + endif() + list(APPEND INSTALLTARGETS ${STarget}) + endif() + + if(VISIT_JAVA) + file(COPY ${JATTS} DESTINATION ${JavaClient_BINARY_DIR}/src/plots) + add_custom_target(Java${plot_PNAME} ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} ${JATTS} + DEPENDS_ON JavaClient + WORKING_DIRECTORY $) + endif() + endif() + + visit_add_library( + NAME ${ESerTarget} + SOURCES ${LIBE_SOURCES} + HEADERS ${LIBE_HEADERS} + INCLUDES $ + DEFINES ENGINE ${plot_DEFINES} + DEPENDS_ON visitcommon avtplotter_ser ${plot_ESERLIBS} + SKIP_INSTALL) + + list(APPEND INSTALLTARGETS ${ESerTarget}) + + if(VISIT_PARALLEL) + visit_add_parallel_library( + NAME ${EParTarget} + SOURCES ${LIBE_SOURCES} + HEADERS ${LIBE_HEADERS} + INCLUDES $ + DEFINES ENGINE ${plot_DEFINES} + DEPENDS_ON visitcommon + avtplotter_par + ${plot_EPARLIBS}) + list(APPEND INSTALLTARGETS ${EParTarget}) + endif() + + # one of these is not needed for plugin vs install, which one? + VISIT_INSTALL_PLOT_PLUGINS(${INSTALLTARGETS}) + VISIT_PLUGIN_TARGET_OUTPUT_DIR(plots ${INSTALLTARGETS}) + VISIT_PLUGIN_TARGET_FOLDER(plots ${plot_PNAME} ${INSTALLTARGETS}) +endfunction() + +function(visit_add_operator_plugin) + # required arguments: + # ONAME Name of the operator plugin + # optional arguments: + # GSRC additional sources for the gui target + # VSRC additional sources for the viewer target + # ESRC additional sources for the engine targets + # GLIBS additional libraries for the gui target + # VLIBS additional libraries for the viewer target + # SLIBS additional libraries for the scripting target + # ESERLIBS additional libraries for the serial engine targets + # EPARLIBS additional libraries for the parallel engine targets + # DEFINES any defines for viewer,engine targets + # DISABLE_AUTOGEN disable xml autogeneration + + + # NOTES: not all of the target link libraries being added to the + # targets here are necessary for every operator. They are being added + # for convenience to ease plugin developement + + set(OPTS DISABLE_AUTOGEN) + set(VALS ONAME) + set(MVALS GSRC VSRC ESRC GLIBS VLIBS SLIBS ESERLIBS EPARLIBS DEFINES) + cmake_parse_arguments(operator "${OPTS}" "${VALS}" "${MVALS}" ${ARGN}) + + if(NOT DEFINED operator_ONAME) + message(FATAL_ERROR "Incomplete arguments to visit_add_operator_plugin. Required: ONAME") + endif() + + project(${operator_ONAME}_operator) + + # if doing dev build ?? + if(NOT ${operator_DISABLE_AUTOGEN}) + ADD_OPERATOR_CODE_GEN_TARGETS(${operator_ONAME}) + endif() + + # Handle the different ways some operator's atts have been named. + # This was handled nicely in GenerateCMake when it was writing + # the full CMake code, becuase the Atts name is specified in the XML file. + # Could possibly have the CMake gen code add an ATTSNAME argument + # to this function instead of this logic ... Make it required so + # all plugins use it. Could do the same for FILTERNAME since some use + # 'Plugin' in the name. + if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${operator_ONAME}Attributes.C) + set(CATTS ${operator_ONAME}Attributes) + set(PYATTS Py${operator_ONAME}Attributes) + set(JATTS ${operator_ONAME}Attributes.java) + elseif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${operator_ONAME}OperatorAttributes.C) + set(CATTS ${operator_ONAME}OperatorAttributes) + set(PYATTS Py${operator_ONAME}OperatorAttributes) + set(JATTS ${operator_ONAME}OperatorAttributes.java) + elseif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${operator_ONAME}Atts.C) + set(CATTS ${operator_ONAME}Atts) + set(PYATTS Py${operator_ONAME}Atts) + set(JATTS ${operator_ONAME}Atts.java) + elseif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${operator_ONAME}.C) + set(CATTS ${operator_ONAME}) + set(PYATTS Py${operator_ONAME}) + set(JATTS ${operator_ONAME}.java) + else() + message(FATAL_ERROR "Cound not find name for ${operator_ONAME}'s Attributes class. Expecting ${operator_ONAME}Attributes, ${operator_ONAME}OperatorAttributes, ${operator_ONAME}Atts or ${operator_ONAME}") + endif() + + set(COMMON_SOURCES + ${operator_ONAME}PluginInfo.C + ${operator_ONAME}CommonPluginInfo.C + ${CATTS}.C) + set(COMMON_HEADERS + ${operator_ONAME}PluginInfo.h + ${CATTS}.h) + + set(LIBI_SOURCES ${operator_ONAME}PluginInfo.C) + set(LIBI_HEADERS ${operator_ONAME}PluginInfo.h) + + set(LIBG_SOURCES + ${operator_ONAME}GUIPluginInfo.C + Qvis${operator_ONAME}Window.C + ${COMMON_SOURCES}) + set(LIBG_HEADERS + Qvis${operator_ONAME}Window.h + ${COMMON_HEADERS}) + if(DEFINED operator_GSRC) + list(APPEND LIBG_SOURCES ${operator_GSRC}) + foreach(src ${operator_GSRC}) + string(REPLACE ".C" ".h" hdr ${src}) + list(APPEND LIBG_HEADERS ${hdr}) + endforeach() + endif() + + set(LIBV_SOURCES + ${operator_ONAME}ViewerEnginePluginInfo.C + ${operator_ONAME}ViewerPluginInfo.C + ${COMMON_SOURCES}) + set(LIBV_HEADERS + ${COMMON_HEADERS}) + + if(DEFINED operator_VSRC) + list(APPEND LIBV_SOURCES ${operator_VSRC}) + foreach(src ${operator_VSRC}) + string(REPLACE ".C" ".h" src hdr) + list(APPEND LIBV_HEADERS ${hdr}) + endforeach() + endif() + + set(LIBE_SOURCES + ${operator_ONAME}ViewerEnginePluginInfo.C + ${operator_ONAME}EnginePluginInfo.C + ${COMMON_SOURCES}) + set(LIBE_HEADERS + ${COMMON_HEADERS}) + + # some operators don't use the standard filter name + if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/avt${operator_ONAME}Filter.C) + list(APPEND LIBE_SOURCES avt${operator_ONAME}Filter.C) + list(APPEND LIBE_HEADERS avt${operator_ONAME}Filter.h) + elseif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/avt${operator_ONAME}PluginFilter.C) + list(APPEND LIBE_SOURCES avt${operator_ONAME}PluginFilter.C) + list(APPEND LIBE_HEADERS avt${operator_ONAME}PluginFilter.h) + else() + message("FATAL_ERROR Could not determine name of ${operator_ONAME}'s filter class. Expecting avt${operator_ONAME}Filter or avt${operator_ONAME}PluginFilter.") + endif() + + + if(DEFINED operator_ESRC) + list(APPEND LIBE_SOURCES ${operator_ESRC}) + foreach(src ${operator_ESRC}) + string(REPLACE ".C" ".h" src hdr) + list(APPEND LIBE_HEADERS ${hdr}) + endforeach() + endif() + + set(ITarget I${operator_ONAME}Operator) + set(GTarget G${operator_ONAME}Operator) + set(VTarget V${operator_ONAME}Operator) + set(STarget S${operator_ONAME}Operator) + set(ESerTarget E${operator_ONAME}Operator_ser) + set(EParTarget E${operator_ONAME}Operator_par) + + # we are setting SKIP_INSTALL for all visit_add_library calls + # because plugins don't need to be installed via the export-targets + # install path. Will use standard install logic at end of the method. + visit_add_library( + NAME ${ITarget} + SOURCES ${LIBI_SOURCES} + HEADERS ${LIBI_HEADERS} + INCLUDES $ + DEPENDS_ON visitcommon + SKIP_INSTALL) + + set(INSTALLTARGETS ${ITarget}) + + if(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) + visit_add_library( + NAME ${GTarget} + SOURCES ${LIBG_SOURCES} + HEADERS ${LIBG_HEADERS} + INCLUDES $ + DEPENDS_ON visitcommon gui winutil avtdbatts ${QT_QTWIDGETS_LIBRARY} ${operator_GLIBS} + SKIP_INSTALL) + + set_target_properties(${GTarget} PROPERTIES AUTOMOC ON) + + visit_add_library( + NAME ${VTarget} + SOURCES ${LIBV_SOURCES} + HEADERS ${LIBV_HEADERS} + INCLUDES $ + DEFINES VIEWER ${plot_DEFINES} + DEPENDS_ON visitcommon viewer ${operator_VLIBS} + SKIP_INSTALL) + + set_target_properties(${VTarget} PROPERTIES AUTOMOC ON) + + if(QT_VERSION VERSION_GREATER_EQUAL "6.2.0") + qt6_disable_unicode_defines(${GTarget}) + qt6_disable_unicode_defines(${VTarget}) + endif() + + list(APPEND INSTALLTARGETS ${GTarget} ${VTarget}) + + if(VISIT_PYTHON_SCRIPTING) + visit_add_library( + NAME ${STarget} + SOURCES ${operator_ONAME}ScriptingPluginInfo.C + ${PYATTS}.C + ${COMMON_SOURCES} + HEADERS ${PYATTS}.h + ${COMMON_HEADERS} + INCLUDES $ + $ + DEPENDS_ON visitcommon visitpy ${PYTHON_LIBRARY} ${operator_SLIBS} + SKIP_INSTALL) + + if(WIN32) + # This prevents python from #defining snprintf as _snprintf + target_compile_definitions(${STarget} PRIVATE HAVE_SNPRINTF) + endif() + list(APPEND INSTALLTARGETS ${STarget}) + endif() + + if(VISIT_JAVA) + file(COPY ${JATTS} DESTINATION ${JavaClient_BINARY_DIR}/src/operators) + add_custom_target(Java${plot_ONAME} ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} ${JATTS} + DEPENDS_ON JavaClient + WORKING_DIRECTORY $) + endif() + endif() + + visit_add_library( + NAME ${ESerTarget} + SOURCES ${LIBE_SOURCES} + HEADERS ${LIBE_HEADERS} + INCLUDES $ + DEFINES ENGINE ${operator_DEFINES} + DEPENDS_ON visitcommon + avtexpressions_ser ${operator_ESERLIBS} + SKIP_INSTALL) + + list(APPEND INSTALLTARGETS ${ESerTarget}) + + if(VISIT_PARALLEL) + visit_add_parallel_library( + NAME ${EParTarget} + SOURCES ${LIBE_SOURCES} + HEADERS ${LIBE_HEADERS} + INCLUDES $ + DEFINES ENGINE ${operator_DEFINES} + DEPENDS_ON visitcommon + avtexpressions_par + ${operator_EPARLIBS}) + list(APPEND INSTALLTARGETS ${EParTarget}) + endif() + + # one of these is not needed for plugin vs install, which one? + VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) + VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) + VISIT_PLUGIN_TARGET_FOLDER(operators ${operator_ONAME} ${INSTALLTARGETS}) +endfunction() + diff --git a/src/avt/Database/Database/avtGenericDatabase.C b/src/avt/Database/Database/avtGenericDatabase.C index 311d1316c04..b0ece06481c 100644 --- a/src/avt/Database/Database/avtGenericDatabase.C +++ b/src/avt/Database/Database/avtGenericDatabase.C @@ -302,7 +302,7 @@ DebugDumpDatasetCollection(avtDatasetCollection &dsc, int ndoms, // // Purpose: // Merge generated ghost zones/nodes with extra ghost zones/nodes provided -// by the database in the form of avtExtraGhostZones and +// by the database in the form of avtExtraGhostZones and // avtExtraGhostNodes. // // Returns: void @@ -311,6 +311,8 @@ DebugDumpDatasetCollection(avtDatasetCollection &dsc, int ndoms, // Creation: 10/17/24 // // Modifications: +// Justin Privitera, Thu Dec 12 16:49:08 PST 2024 +// Added debugging information. // // **************************************************************************** @@ -327,10 +329,8 @@ avtGenericDatabase::AugmentGhostData(avtDatasetCollection &ds, vtkDataSet *dataset = ds.GetDataset(domain_id, 0); if (dataset != NULL) { - // TODO is a single bool in the mili db header fine for valid node ids? - // this lambda handles zone and node cases - auto combineGhosts = [this, spec, domain_id](vtkUnsignedCharArray* ghosts, + auto combineGhosts = [this, spec, domain_id](vtkUnsignedCharArray* ghosts, vtkUnsignedCharArray* extraGhosts, vtkDataSet* dataset, const std::string &arrayName, @@ -348,18 +348,28 @@ avtGenericDatabase::AugmentGhostData(avtDatasetCollection &ds, { // we don't know what to do in the case that the ghost // zone/node array has more than one component + debug1 << "AugmentGhostData: When attempting to combine " + "avtGhostNodes/Zones and avtExtraGhostNodes/Zones, " + "one of the arrays has more than one component. " + "This should not be possible. Please contact a " + "VisIt developer." << std::endl; EXCEPTION0(ImproperUseException); } const int num_tuples = ghosts->GetNumberOfTuples(); if (num_tuples != extraGhosts->GetNumberOfTuples()) { // we don't know what to do in the case that the original - // and extra ghost zone/node arrays do not have the same + // and extra ghost zone/node arrays do not have the same // number of tuples. + debug1 << "AugmentGhostData: When attempting to combine " + "avtGhostNodes/Zones and avtExtraGhostNodes/Zones, " + "the arrays do not have the same number of tuples. " + "This should not be possible. Please contact a " + "VisIt developer." << std::endl; EXCEPTION0(ImproperUseException); } - // create a new ghost zone/node array that will be the result + // create a new ghost zone/node array that will be the result // of merging the existing and extra. vtkUnsignedCharArray *newGhosts = vtkUnsignedCharArray::New(); newGhosts->SetName(arrayName.c_str()); @@ -421,8 +431,8 @@ avtGenericDatabase::AugmentGhostData(avtDatasetCollection &ds, newGhosts->Delete(); dataset->GetCellData()->CopyFieldOn(arrayName.c_str()); - // if we are cell centered then we need to perform some - // extra steps to tell the metadata that we now have + // if we are cell centered then we need to perform some + // extra steps to tell the metadata that we now have // ghost zones. const int ts = spec->GetTimestep(); avtDatabaseMetaData *md = GetMetaData(ts); @@ -441,10 +451,10 @@ avtGenericDatabase::AugmentGhostData(avtDatasetCollection &ds, }; // zones first - vtkUnsignedCharArray *ghostZones = + vtkUnsignedCharArray *ghostZones = static_cast( dataset->GetCellData()->GetArray("avtGhostZones")); - vtkUnsignedCharArray *extraGhostZones = + vtkUnsignedCharArray *extraGhostZones = static_cast( dataset->GetCellData()->GetArray("avtExtraGhostZones")); @@ -455,10 +465,10 @@ avtGenericDatabase::AugmentGhostData(avtDatasetCollection &ds, true /*cell centered is true*/); // nodes second - vtkUnsignedCharArray *ghostNodes = + vtkUnsignedCharArray *ghostNodes = static_cast( dataset->GetPointData()->GetArray("avtGhostNodes")); - vtkUnsignedCharArray *extraGhostNodes = + vtkUnsignedCharArray *extraGhostNodes = static_cast( dataset->GetPointData()->GetArray("avtExtraGhostNodes")); @@ -669,10 +679,13 @@ avtGenericDatabase::AugmentGhostData(avtDatasetCollection &ds, // // Alister Maguire, Tue Sep 24 10:04:42 MST 2019 // Added a call to GetQOTOutput when prompted. -// +// // Justin Privitera, Tue Oct 22 10:32:27 PDT 2024 // Call augment ghost data unconditionally. // +// Kathleen Biagas, Mon Nov 4, 2024 +// Only call AugmengGhostData if avtMeshMetaData:hasExtraGhostInfo is true. +// // **************************************************************************** avtDataTree_p @@ -1018,8 +1031,12 @@ avtGenericDatabase::GetOutput(avtDataRequest_p spec, spec, src, allDomains, canDoCollectiveCommunication); } - // unconditionally add ghost data if the database provided extra ghost information - AugmentGhostData(datasetCollection, spec, src); + + if (md->GetMesh(meshname) != NULL && md->GetMesh(meshname)->hasExtraGhostInfo) + { + // unconditionally add ghost data if the database provided extra ghost information + AugmentGhostData(datasetCollection, spec, src); + } // // Finally, do the material selection. @@ -3301,7 +3318,7 @@ avtGenericDatabase::GetLabelVariable(const char *varname, int ts, int domain, // // Kathleen Biagas, Thu Sep 11 09:10:42 PDT 2014 // Keep avtOriginalNodeNumbers if present. -// +// // Justin Privitera, Tue Oct 22 10:32:27 PDT 2024 // Keep extra ghost zone/node arrays if present. // @@ -6025,7 +6042,7 @@ avtGenericDatabase::EnumScalarSelect(avtDatasetCollection &dsc, // // Mark C. Miller, Wed Mar 4 18:00:38 PST 2009 // Adjusted for dbio-only build -// +// // Justin Privitera, Fri Sep 27 10:18:37 PDT 2024 // Relaxed restriction on input data only being floats. // **************************************************************************** @@ -7986,10 +8003,18 @@ avtGenericDatabase::CommunicateGhostZonesFromDomainBoundariesFromFile( // Modified to handle the case where a variable is defined on a subset // of the materials and a domain has mixed materials without the material // the variable was defined on. -// +// // Justin Privitera, Tue Oct 22 10:32:27 PDT 2024 // Exchange extra ghost zone/node arrays. // +// Kathleen Biagas, Thu Oct 31, 2024 +// Don't attempt to Exchange extra ghost zone/node arrays if no process +// has extra ghost information. +// +// Kathleen Biagas, Mon Nov 4, 2024 +// Use avtMeshMetaData field 'hasExtraGhostInfo' to determine whether or +// not to handle extra ghost information. +// // **************************************************************************** bool @@ -8610,72 +8635,75 @@ avtGenericDatabase::CommunicateGhostZonesFromDomainBoundaries( } } - // - // Exchange ExtraGhostZone Arrays. - // - // this logic was added to support the functionality in the - // AugmentGhostData() function. - vector extraGhostZones; - for (size_t j = 0 ; j < doms.size() ; j++) + if(md->GetMesh(meshname)->hasExtraGhostInfo) { - vtkDataSet *ds1 = list[j]; - if (ds1 == NULL || - ds1->GetNumberOfPoints() == 0 || ds1->GetNumberOfCells() == 0) + // + // Exchange ExtraGhostZone Arrays. + // + // this logic was added to support the functionality in the + // AugmentGhostData() function. + vector extraGhostZones; + for (size_t j = 0 ; j < doms.size() ; j++) { - extraGhostZones.push_back(NULL); - continue; + vtkDataSet *ds1 = list[j]; + if (ds1 == NULL || + ds1->GetNumberOfPoints() == 0 || ds1->GetNumberOfCells() == 0) + { + extraGhostZones.push_back(NULL); + continue; + } + if (ds1->GetCellData()->GetArray("avtExtraGhostZones")) + { + extraGhostZones.push_back(ds1->GetCellData()->GetArray( + "avtExtraGhostZones")); + } } - if (ds1->GetCellData()->GetArray("avtExtraGhostZones")) + + vector extraGhostZonesOut; + extraGhostZonesOut = dbi->ExchangeScalar(doms,false,extraGhostZones); + for (int j = 0 ; j < (int)doms.size() ; j++) { - extraGhostZones.push_back(ds1->GetCellData()->GetArray( - "avtExtraGhostZones")); + vtkDataSet *ds1 = ds.GetDataset(j, 0); + if (ds1 == NULL || + ds1->GetNumberOfPoints() == 0 || ds1->GetNumberOfCells() == 0) + continue; + ds1->GetCellData()->AddArray(extraGhostZonesOut[j]); + extraGhostZonesOut[j]->Delete(); } - } - vector extraGhostZonesOut; - extraGhostZonesOut = dbi->ExchangeScalar(doms,false,extraGhostZones); - for (int j = 0 ; j < (int)doms.size() ; j++) - { - vtkDataSet *ds1 = ds.GetDataset(j, 0); - if (ds1 == NULL || - ds1->GetNumberOfPoints() == 0 || ds1->GetNumberOfCells() == 0) - continue; - ds1->GetCellData()->AddArray(extraGhostZonesOut[j]); - extraGhostZonesOut[j]->Delete(); - } - - // - // Exchange ExtraGhostNode Arrays. - // - // this logic was added to support the functionality in the - // AugmentGhostData() function. - vector extraGhostNodes; - for (size_t j = 0 ; j < doms.size() ; j++) - { - vtkDataSet *ds1 = list[j]; - if (ds1 == NULL || - ds1->GetNumberOfPoints() == 0 || ds1->GetNumberOfCells() == 0) + // + // Exchange ExtraGhostNode Arrays. + // + // this logic was added to support the functionality in the + // AugmentGhostData() function. + vector extraGhostNodes; + for (size_t j = 0 ; j < doms.size() ; j++) { - extraGhostNodes.push_back(NULL); - continue; + vtkDataSet *ds1 = list[j]; + if (ds1 == NULL || + ds1->GetNumberOfPoints() == 0 || ds1->GetNumberOfCells() == 0) + { + extraGhostNodes.push_back(NULL); + continue; + } + if (ds1->GetPointData()->GetArray("avtExtraGhostNodes")) + { + extraGhostNodes.push_back(ds1->GetPointData()->GetArray( + "avtExtraGhostNodes")); + } } - if (ds1->GetPointData()->GetArray("avtExtraGhostNodes")) + + vector extraGhostNodesOut; + extraGhostNodesOut = dbi->ExchangeScalar(doms,true,extraGhostNodes); + for (int j = 0 ; j < (int)doms.size() ; j++) { - extraGhostNodes.push_back(ds1->GetPointData()->GetArray( - "avtExtraGhostNodes")); + vtkDataSet *ds1 = ds.GetDataset(j, 0); + if (ds1 == NULL || + ds1->GetNumberOfPoints() == 0 || ds1->GetNumberOfCells() == 0) + continue; + ds1->GetPointData()->AddArray(extraGhostNodesOut[j]); + extraGhostNodesOut[j]->Delete(); } - - } - vector extraGhostNodesOut; - extraGhostNodesOut = dbi->ExchangeScalar(doms,true,extraGhostNodes); - for (int j = 0 ; j < (int)doms.size() ; j++) - { - vtkDataSet *ds1 = ds.GetDataset(j, 0); - if (ds1 == NULL || - ds1->GetNumberOfPoints() == 0 || ds1->GetNumberOfCells() == 0) - continue; - ds1->GetPointData()->AddArray(extraGhostNodesOut[j]); - extraGhostNodesOut[j]->Delete(); } // diff --git a/src/avt/Database/Formats/avtFileFormat.C b/src/avt/Database/Formats/avtFileFormat.C index b7905584282..5705cd13b9c 100644 --- a/src/avt/Database/Formats/avtFileFormat.C +++ b/src/avt/Database/Formats/avtFileFormat.C @@ -741,6 +741,10 @@ avtFileFormat::AddSpeciesToMetaData(avtDatabaseMetaData *md, string name, // Mark C. Miller, Wed Dec 13 15:23:05 PST 2023 // Adjusted regular expression to take last group of digits BEFORE // any extension if present. +// +// Mark C. Miller, Mon Dec 2 11:30:21 PST 2024 +// Adjust default logic to search for longer strings of digits first and +// then for shorter strings of digits. // **************************************************************************** int @@ -749,13 +753,34 @@ avtFileFormat::GuessCycle(const char *fname, const char *re) string reToUse = avtDatabaseMetaData::GetCycleFromFilenameRegex(); if (reToUse == "") reToUse = re ? re : ""; - if (reToUse == "") - reToUse = "<([0-9]+)([^0-9]*)\\..*$> \\1"; + if (reToUse != "") + { + double d = GuessCycleOrTime(fname, reToUse.c_str()); + if (d == INVALID_TIME) return INVALID_CYCLE; + return (int) d; + } - double d = GuessCycleOrTime(fname, reToUse.c_str()); + // + // The above logic will compute cycle from filename for cases where + // a specific regular expression has been provided. + // + // The logic below attempts to do so in the absence of any specific + // information about how to do it. It is the "default" case. + // + // Search for a string of 6 or more digits, then 5 or more, + // then 4 or more and finally 3 or more. Stop with the longest + // found and use that. + // + for (int i = 6; i > 2; i--) + { + char tmp[32]; + snprintf(tmp, sizeof(tmp), "<([0-9]{%d,})> \\1", i); + double d = GuessCycleOrTime(fname, tmp); + if (d == INVALID_TIME) continue; + return (int) d; + } - if (d == INVALID_TIME) return INVALID_CYCLE; - return (int) d; + return INVALID_CYCLE; } // **************************************************************************** diff --git a/src/avt/Database/Ghost/avtStructuredDomainBoundaries.C b/src/avt/Database/Ghost/avtStructuredDomainBoundaries.C index 0e2742620a1..a12d39f8d63 100644 --- a/src/avt/Database/Ghost/avtStructuredDomainBoundaries.C +++ b/src/avt/Database/Ghost/avtStructuredDomainBoundaries.C @@ -401,7 +401,7 @@ BoundaryHelperFunctions::FillRectilinearBoundaryData(int d1, // Programmer: Jeremy Meredith // Creation: November 21, 2001 // -// Note: bnddata, bndmixmat, and bndmixzone may each be NULL. +// Note: bnddata, bndmixmat, and bndmixzone may each be NULL. // olddata may be NULL as well as long as the mixlen is zero. // // Modifications: @@ -874,7 +874,7 @@ BoundaryHelperFunctions::CommunicateMixedBoundaryData(const vector &doma if (domain2proc[d1] != domain2proc[d2]) { - + if (domain2proc[d1] == rank) { if (bnddata) @@ -996,12 +996,12 @@ BoundaryHelperFunctions::CopyOldValues(int d1, // comp_num 0=X, 1=Y, 2=Z // // Programmer: Hank Childs -// Creation: November 11, 2003 +// Creation: November 11, 2003 // // **************************************************************************** template void -BoundaryHelperFunctions::CopyOldRectilinearValues(int d1, const T *olddata, +BoundaryHelperFunctions::CopyOldRectilinearValues(int d1, const T *olddata, T *newdata, int comp_num) { Boundary *bi = &sdb->boundary[d1]; @@ -1013,7 +1013,7 @@ BoundaryHelperFunctions::CopyOldRectilinearValues(int d1, const T *olddata, int nInew = newbiextents[1] - newbiextents[0] + 1; int nJnew = newbiextents[3] - newbiextents[2] + 1; int nKnew = newbiextents[5] - newbiextents[4] + 1; - + if (comp_num == 0) { // @@ -1030,7 +1030,7 @@ BoundaryHelperFunctions::CopyOldRectilinearValues(int d1, const T *olddata, int newindex = bi->NewPointIndex(i_ind, j_ind, k_ind); int oldI = oldindex % nIold; int newI = newindex % nInew; - newdata[newI] = olddata[oldI]; + newdata[newI] = olddata[oldI]; } } else if (comp_num == 1) @@ -1043,7 +1043,7 @@ BoundaryHelperFunctions::CopyOldRectilinearValues(int d1, const T *olddata, int newindex = bi->NewPointIndex(i_ind, j_ind, k_ind); int oldJ = (oldindex/nIold) % nJold; int newJ = (newindex/nInew) % nJnew; - newdata[newJ] = olddata[oldJ]; + newdata[newJ] = olddata[oldJ]; } } else if (comp_num == 2) @@ -1056,7 +1056,7 @@ BoundaryHelperFunctions::CopyOldRectilinearValues(int d1, const T *olddata, int newindex = bi->NewPointIndex(i_ind, j_ind, k_ind); int oldK = (oldindex/(nIold*nJold)) % nKold; int newK = (newindex/(nInew*nJnew)) % nKnew; - newdata[newK] = olddata[oldK]; + newdata[newK] = olddata[oldK]; } } } @@ -1154,7 +1154,7 @@ avtStructuredDomainBoundaries::SetExistence(int d1, { for (int i=n1extents[0]; i<=n1extents[1]; i++) { - int index = (isPointData ? + int index = (isPointData ? bi->NewPointIndexFromNeighbor(n1, i,j,k) : bi->NewCellIndexFromNeighbor(n1, i,j,k)); if (index >= 0) @@ -1171,7 +1171,7 @@ avtStructuredDomainBoundaries::SetExistence(int d1, // Method: BoundaryHelperFunctions::SetNewBoundaryData // // Purpose: -// Set the ghost values of the given domain using the temporary +// Set the ghost values of the given domain using the temporary // boundary data. // // Arguments: @@ -1253,7 +1253,7 @@ BoundaryHelperFunctions::SetNewBoundaryData(int d1, { for (int i=n1extents[0]; i<=n1extents[1]; i++) { - int newindex = (isPointData ? + int newindex = (isPointData ? bi->NewPointIndexFromNeighbor(n1, i,j,k) : bi->NewCellIndexFromNeighbor(n1, i,j,k)); if (newindex >= 0) @@ -1272,7 +1272,7 @@ BoundaryHelperFunctions::SetNewBoundaryData(int d1, // Method: BoundaryHelperFunctions::SetNewRectilinearBoundaryData // // Purpose: -// Set the ghost values of the given domain using the temporary +// Set the ghost values of the given domain using the temporary // boundary data. // // Arguments: @@ -1576,7 +1576,7 @@ BoundaryHelperFunctions::FakeNonexistentBoundaryData(int d1, } delete[] newexists; } - + // ---------------------------------------------------------------------------- // public methods @@ -1609,7 +1609,7 @@ avtStructuredDomainBoundaries::avtStructuredDomainBoundaries( bhf_float = new BoundaryHelperFunctions(this); bhf_double = new BoundaryHelperFunctions(this); bhf_uchar = new BoundaryHelperFunctions(this); - shouldComputeNeighborsFromExtents = canComputeNeighborsFromExtents; + shouldComputeNeighborsFromExtents = canComputeNeighborsFromExtents; haveCalculatedBoundaries = false; maxAMRLevel = 1; } @@ -1622,7 +1622,7 @@ avtStructuredDomainBoundaries::avtStructuredDomainBoundaries( // // Modifications: // Mark C. Miller, ed Mar 23 15:29:56 PST 2005 -// Added code to delete stuff new'd in constructor +// Added code to delete stuff new'd in constructor // // **************************************************************************** avtStructuredDomainBoundaries::~avtStructuredDomainBoundaries() @@ -1741,8 +1741,8 @@ avtStructuredDomainBoundaries::SetExtents(int domain, int e[6]) // // **************************************************************************** void -avtStructuredDomainBoundaries::AddNeighbor(int domain, int d, int mi, int o[3], - int e[6], RefinementRelationship rr, +avtStructuredDomainBoundaries::AddNeighbor(int domain, int d, int mi, int o[3], + int e[6], RefinementRelationship rr, const std::vector& ref_ratio, NeighborRelationship nr) { @@ -1807,6 +1807,9 @@ avtStructuredDomainBoundaries::Finish(int domain) // Brad Whitlock, Sun Apr 22 08:52:14 PDT 2012 // Double support. // +// Kathleen Biagas, Fri Nov 1, 2024 +// Added consistency check for dataTypes. +// // **************************************************************************** vector avtStructuredDomainBoundaries::ExchangeScalar(vector domainNum, @@ -1815,16 +1818,27 @@ avtStructuredDomainBoundaries::ExchangeScalar(vector domainNum, { int dataType = (scalars.empty() ? -1 : scalars[0]->GetDataType()); + int maxDataType = dataType; #ifdef PARALLEL // Let's get them all to agree on one data type. - int myDataType = dataType; - MPI_Allreduce(&myDataType, &dataType, 1, MPI_INT, MPI_MAX, VISIT_MPI_COMM); + MPI_Allreduce(&dataType, &maxDataType, 1, MPI_INT, MPI_MAX, VISIT_MPI_COMM); + + int hasDataTypeMismatch = ((dataType >= 0) && (dataType != maxDataType)); + int hasDataTypeMismatchMax = hasDataTypeMismatch; + MPI_Allreduce(&hasDataTypeMismatch, &hasDataTypeMismatchMax, 1, MPI_INT, MPI_MAX, VISIT_MPI_COMM); + if(hasDataTypeMismatchMax) + { + // This should never happen, so throw the exception. + EXCEPTION1(VisItException, + "avtStructuredDomainBoundaries:ExchangeScalar " + "vtkDataArray data types do not match."); + } #endif - if (dataType < 0) + if (maxDataType < 0) return scalars; - switch (dataType) + switch (maxDataType) { case VTK_FLOAT: return ExchangeFloatScalar(domainNum, isPointData, scalars); @@ -1870,7 +1884,7 @@ avtStructuredDomainBoundaries::ExchangeScalar(vector domainNum, // Propagate variable names. // // Kathleen Bonnell, Fri Feb 8 11:03:49 PST 2002 -// vtkScalars has been deprecated in VTK 4.0, use vtkDataArray +// vtkScalars has been deprecated in VTK 4.0, use vtkDataArray // and vtkFloatArray instead. // // Jeremy Meredith, Fri Nov 7 15:13:56 PST 2003 @@ -1940,7 +1954,7 @@ avtStructuredDomainBoundaries::ExchangeFloatScalar(vector domainNum, Boundary *bi = &boundary[domainNum[d]]; // Create the new VTK objects - out[d] = vtkFloatArray::New(); + out[d] = vtkFloatArray::New(); out[d]->SetName(scalars[d]->GetName()); if (isPointData) out[d]->SetNumberOfTuples(bi->newnpts); @@ -2041,7 +2055,7 @@ avtStructuredDomainBoundaries::ExchangeDoubleScalar(vector domainNum, Boundary *bi = &boundary[domainNum[d]]; // Create the new VTK objects - out[d] = vtkDoubleArray::New(); + out[d] = vtkDoubleArray::New(); out[d]->SetName(scalars[d]->GetName()); if (isPointData) out[d]->SetNumberOfTuples(bi->newnpts); @@ -2150,7 +2164,7 @@ avtStructuredDomainBoundaries::ExchangeIntScalar(vector domainNum, Boundary *bi = &boundary[domainNum[d]]; // Create the new VTK objects - out[d] = vtkIntArray::New(); + out[d] = vtkIntArray::New(); out[d]->SetName(scalars[d]->GetName()); if (isPointData) out[d]->SetNumberOfTuples(bi->newnpts); @@ -2260,7 +2274,7 @@ avtStructuredDomainBoundaries::ExchangeUCharScalar(vector domainNum, Boundary *bi = &boundary[domainNum[d]]; // Create the new VTK objects - out[d] = vtkUnsignedCharArray::New(); + out[d] = vtkUnsignedCharArray::New(); out[d]->SetName(scalars[d]->GetName()); if (isPointData) out[d]->SetNumberOfTuples(bi->newnpts); @@ -2302,6 +2316,8 @@ avtStructuredDomainBoundaries::ExchangeUCharScalar(vector domainNum, // Creation: April 21, 2015 // // Modifications: +// Kathleen Biagas, Fri Nov 1, 2024 +// Added consistency check for dataTypes. // // **************************************************************************** vector @@ -2310,17 +2326,29 @@ avtStructuredDomainBoundaries::ExchangeVector(vector domainNum, vector vectors) { int dataType = (vectors.empty() ? -1 : vectors[0]->GetDataType()); - + + int maxDataType = dataType; #ifdef PARALLEL // Let's get them all to agree on one data type. - int myDataType = dataType; - MPI_Allreduce(&myDataType, &dataType, 1, MPI_INT, MPI_MAX, VISIT_MPI_COMM); + MPI_Allreduce(&dataType, &maxDataType, 1, MPI_INT, MPI_MAX, VISIT_MPI_COMM); + + // Now verify if there is a dataType mismatch. + int hasDataTypeMismatch = ((dataType >= 0) && (dataType != maxDataType)); + int hasDataTypeMismatchMax = hasDataTypeMismatch; + MPI_Allreduce(&hasDataTypeMismatch, &hasDataTypeMismatchMax, 1, MPI_INT, MPI_MAX, VISIT_MPI_COMM); + if(hasDataTypeMismatchMax) + { + // This should never happen, so throw the exception. + EXCEPTION1(VisItException, + "avtStructuredDomainBoundaries:ExchangeVector " + "vtkDataArray data types do not match."); + } #endif - - if (dataType < 0) + + if (maxDataType < 0) return vectors; - - switch (dataType) + + switch (maxDataType) { case VTK_FLOAT: return ExchangeFloatVector(domainNum, isPointData, vectors); @@ -2363,13 +2391,13 @@ avtStructuredDomainBoundaries::ExchangeVector(vector domainNum, // Propagate variable names. // // Kathleen Bonnell, Fri Feb 8 11:03:49 PST 2002 -// vtkVectors has been deprecated in VTK 4.0, use vtkDataArray +// vtkVectors has been deprecated in VTK 4.0, use vtkDataArray // and vtkFloatArray instead. // -// Kathleen Bonnell, Mon May 20 13:33:03 PDT 2002 +// Kathleen Bonnell, Mon May 20 13:33:03 PDT 2002 // Change name to reflect underlying data type. Allow for arbitrary -// number of components in the array. -// +// number of components in the array. +// // Hank Childs, Fri Dec 6 14:56:20 PST 2002 // Do not assume that the number of vectors is > 0. // @@ -2438,7 +2466,7 @@ avtStructuredDomainBoundaries::ExchangeFloatVector(vector domainNum, { // Create the new VTK objects out[d] = vtkFloatArray::New(); - out[d]->SetNumberOfComponents(nComp); + out[d]->SetNumberOfComponents(nComp); out[d]->SetName(vectors[d]->GetName()); if (isPointData) out[d]->SetNumberOfTuples(boundary[domainNum[d]].newnpts); @@ -2538,8 +2566,8 @@ avtStructuredDomainBoundaries::ExchangeDoubleVector(vector domainNum, for (size_t d = 0; d < vectors.size(); d++) { // Create the new VTK objects - out[d] = vtkDoubleArray::New(); - out[d]->SetNumberOfComponents(nComp); + out[d] = vtkDoubleArray::New(); + out[d]->SetNumberOfComponents(nComp); out[d]->SetName(vectors[d]->GetName()); if (isPointData) out[d]->SetNumberOfTuples(boundary[domainNum[d]].newnpts); @@ -2580,19 +2608,19 @@ avtStructuredDomainBoundaries::ExchangeDoubleVector(vector domainNum, // Notes: // Taken from ExchangeFloatVector and modified for integer data types. // -// Programmer: Kathleen Bonnell -// Creation: May 20, 2002 +// Programmer: Kathleen Bonnell +// Creation: May 20, 2002 // // Modifications: // // Hank Childs, Fri Dec 6 14:56:20 PST 2002 // Do not assume that the number of vectors is > 0. // -// Kathleen Bonnell, Wed Dec 11 09:13:25 PST 2002 -// Preserver underlying data type: use MakeObject instead of New. +// Kathleen Bonnell, Wed Dec 11 09:13:25 PST 2002 +// Preserver underlying data type: use MakeObject instead of New. // -// Kathleen Bonnell, Fri Dec 13 14:07:15 PST 2002 -// Use NewInstance instead of MakeObject, new vtk api. +// Kathleen Bonnell, Fri Dec 13 14:07:15 PST 2002 +// Use NewInstance instead of MakeObject, new vtk api. // // Hank Childs, Wed Jun 29 15:24:35 PDT 2005 // Cache domain2proc. @@ -2658,8 +2686,8 @@ avtStructuredDomainBoundaries::ExchangeIntVector(vector domainNum, for (size_t d = 0; d < vectors.size(); d++) { // Create the new VTK objects - out[d] = vectors[d]->NewInstance(); - out[d]->SetNumberOfComponents(nComp); + out[d] = vectors[d]->NewInstance(); + out[d]->SetNumberOfComponents(nComp); out[d]->SetName(vectors[d]->GetName()); if (isPointData) out[d]->SetNumberOfTuples(boundary[domainNum[d]].newnpts); @@ -2844,7 +2872,7 @@ avtStructuredDomainBoundaries::ExchangeMaterial(vector domainNum, // Set the remaining unset ones (reduced connectivity, etc.) bhf_int->FakeNonexistentBoundaryData(domainNum[d], newmatlist, false); - out[d] = new avtMaterial(oldmat->GetNMaterials(), + out[d] = new avtMaterial(oldmat->GetNMaterials(), oldmat->GetMaterials(), boundary[domainNum[d]].newncells, newmatlist, @@ -3160,8 +3188,8 @@ avtStructuredDomainBoundaries::ConfirmMesh(vector domainNum, { debug1 << "Rejecting domain boundaries because of inconsistency " << "with domain " << domainNum[i] << endl; - debug1 << "File returned " << meshes[i]->GetNumberOfPoints() - << " points, but dbi object believed it should be " + debug1 << "File returned " << meshes[i]->GetNumberOfPoints() + << " points, but dbi object believed it should be " << b.oldnpts << endl; return false; } @@ -3169,8 +3197,8 @@ avtStructuredDomainBoundaries::ConfirmMesh(vector domainNum, { debug1 << "Rejecting domain boundaries because of inconsistency " << "with domain " << domainNum[i] << endl; - debug1 << "File returned " << meshes[i]->GetNumberOfCells() - << "cells, but dbi object believed it should be " + debug1 << "File returned " << meshes[i]->GetNumberOfCells() + << "cells, but dbi object believed it should be " << b.oldncells << endl; return false; } @@ -3238,7 +3266,7 @@ avtStructuredDomainBoundaries::ResetCachedMembers(void) void avtStructuredDomainBoundaries::CreateGhostZones(vtkDataSet *outMesh, vtkDataSet *inMesh, Boundary *bi, - bool haveCommunicatedGhosts, + bool haveCommunicatedGhosts, int domain, unsigned char ***ghosts) { vtkUnsignedCharArray *oldGhosts = (vtkUnsignedCharArray *) @@ -3255,11 +3283,11 @@ avtStructuredDomainBoundaries::CreateGhostZones(vtkDataSet *outMesh, { if (oldGhosts == NULL) EXCEPTION0(ImproperUseException); // we should never get to this point - bhf_uchar->CopyOldValues(domain, + bhf_uchar->CopyOldValues(domain, (unsigned char *) oldGhosts->GetVoidPointer(0), (unsigned char *) ghostCells->GetVoidPointer(0), false, 1); - bhf_uchar->SetNewBoundaryData(domain, ghosts, + bhf_uchar->SetNewBoundaryData(domain, ghosts, (unsigned char *) ghostCells->GetVoidPointer(0), false, 1); } @@ -3291,7 +3319,7 @@ avtStructuredDomainBoundaries::CreateGhostZones(vtkDataSet *outMesh, outMesh->GetCellData()->AddArray(ghostCells); ghostCells->Delete(); - outMesh->GetInformation()->Set(vtkStreamingDemandDrivenPipeline::UPDATE_NUMBER_OF_GHOST_LEVELS(), 0); + outMesh->GetInformation()->Set(vtkStreamingDemandDrivenPipeline::UPDATE_NUMBER_OF_GHOST_LEVELS(), 0); // // Create a field-data array indicating the extents of real zones. @@ -3330,7 +3358,7 @@ avtStructuredDomainBoundaries::CreateGhostZones(vtkDataSet *outMesh, // Made use of templatized functions. Added call to fake boundary // data when it is nonexistent. // -// Kathleen Bonnell, Wed Jul 10 16:02:56 PDT 2002 +// Kathleen Bonnell, Wed Jul 10 16:02:56 PDT 2002 // Create a field-data array indicating the extents of real zones. // Used during ghostzone removal. // @@ -3462,7 +3490,7 @@ avtCurvilinearDomainBoundaries::ExchangeMesh(Helper *bhf, int vtktype, Boundary *bi = &boundary[d1]; // Create the VTK objects - vtkStructuredGrid *outm = vtkStructuredGrid::New(); + vtkStructuredGrid *outm = vtkStructuredGrid::New(); vtkPoints *outp = vtkPoints::New(vtktype); outm->SetPoints(outp); outp->Delete(); @@ -3486,7 +3514,7 @@ avtCurvilinearDomainBoundaries::ExchangeMesh(Helper *bhf, int vtktype, out[d] = outm; } visitTimer->StopTimer(timer_UnpackData, "Ghost Zone Generation phase 4: Unpack Data (in curvmesh version)"); - + bhf->FreeBoundaryData(coord); } @@ -3621,7 +3649,7 @@ avtRectilinearDomainBoundaries::ExchangeMesh(vector domainNum, int d1 = domainNum[d]; Boundary *bi = &boundary[d1]; - vtkRectilinearGrid *outm = vtkRectilinearGrid::New(); + vtkRectilinearGrid *outm = vtkRectilinearGrid::New(); vtkDataArray *newx, *newy, *newz; if(oldx->GetDataType() == VTK_DOUBLE) { @@ -3645,7 +3673,7 @@ avtRectilinearDomainBoundaries::ExchangeMesh(vector domainNum, newx->SetNumberOfTuples(bi->newndims[0]); newy->SetNumberOfTuples(bi->newndims[1]); newz->SetNumberOfTuples(bi->newndims[2]); - + int i; for (i = 0 ; i < bi->newndims[0] ; i++) { @@ -3658,7 +3686,7 @@ avtRectilinearDomainBoundaries::ExchangeMesh(vector domainNum, } else if (id > bi->oldnextents[1]) { - double last_dist = (oldx->GetTuple1(bi->oldndims[0]-1) - + double last_dist = (oldx->GetTuple1(bi->oldndims[0]-1) - oldx->GetTuple1(bi->oldndims[0]-2)); int num_off = (id - bi->oldnextents[1]); newx->SetTuple1(i, oldx->GetTuple1(bi->oldndims[0]-1) + last_dist*num_off); @@ -3683,7 +3711,7 @@ avtRectilinearDomainBoundaries::ExchangeMesh(vector domainNum, } else if (id > bi->oldnextents[3]) { - double last_dist = (oldy->GetTuple1(bi->oldndims[1]-1) - + double last_dist = (oldy->GetTuple1(bi->oldndims[1]-1) - oldy->GetTuple1(bi->oldndims[1]-2)); int num_off = (id - bi->oldnextents[3]); newy->SetTuple1(i, oldy->GetTuple1(bi->oldndims[1]-1) + last_dist*num_off); @@ -3708,7 +3736,7 @@ avtRectilinearDomainBoundaries::ExchangeMesh(vector domainNum, } else if (id > bi->oldnextents[5]) { - double last_dist = (oldz->GetTuple1(bi->oldndims[2]-1) - + double last_dist = (oldz->GetTuple1(bi->oldndims[2]-1) - oldz->GetTuple1(bi->oldndims[2]-2)); int num_off = (id - bi->oldnextents[5]); newz->SetTuple1(i, oldz->GetTuple1(bi->oldndims[2]-1) + last_dist*num_off); @@ -3717,9 +3745,9 @@ avtRectilinearDomainBoundaries::ExchangeMesh(vector domainNum, { int oldindex = bi->OldPointIndex(0, 0, id); int newindex = bi->NewPointIndex(0, 0, id); - int oldK = (oldindex/(bi->oldndims[0]*bi->oldndims[1])) + int oldK = (oldindex/(bi->oldndims[0]*bi->oldndims[1])) % bi->oldndims[2]; - int newK = (newindex/(bi->newndims[0]*bi->newndims[1])) + int newK = (newindex/(bi->newndims[0]*bi->newndims[1])) % bi->newndims[2]; newz->SetTuple1(newK, oldz->GetTuple1(oldK)); } @@ -3789,7 +3817,7 @@ avtStructuredDomainBoundaries::CreateGhostNodes(vector domainNum, // If we are doing DLB, we want to mark nodes as ghost, even if their // neighboring domains are not being used on this iteration. Do this by // consulting the "allDomains" list. Note that we can only play this - // trick because the rest of the routine does not care which domains + // trick because the rest of the routine does not care which domains // are on which processors -- only that we are using them. // int ntotaldomains = (int)wholeBoundary.size(); @@ -3814,7 +3842,7 @@ avtStructuredDomainBoundaries::CreateGhostNodes(vector domainNum, gn->SetNumberOfTuples(npts); gn->SetName("avtGhostNodes"); unsigned char *gnp = gn->GetPointer(0); - + for (int j = 0 ; j < npts ; j++) gnp[j] = 0; @@ -3963,14 +3991,14 @@ avtStructuredDomainBoundaries::SetRefinementRatios(const std::vector &r) // // Kathleen Bonnell, Tue Jan 20 17:26:40 PST 2004 // Reversed order of Exceptions, per Mark Miller's request. -// +// // Hank Childs, Fri Nov 14 10:50:06 PST 2008 // Set data member for tracking maximum AMR level. // // **************************************************************************** void -avtStructuredDomainBoundaries::SetIndicesForAMRPatch(int domain, +avtStructuredDomainBoundaries::SetIndicesForAMRPatch(int domain, int level, int e[6]) { if (!shouldComputeNeighborsFromExtents) @@ -4039,7 +4067,7 @@ avtStructuredDomainBoundaries::SetIndicesForAMRPatch(int domain, // of levels. // // Hank Childs, Tue Jan 4 13:35:56 PST 2011 -// Add support for the types of ghost data needed to create crack-free +// Add support for the types of ghost data needed to create crack-free // isosurfaces with the AMR stitch operator. They are: // (1) values from the coarse patch when a fine patch is embedded in a // coarse patch. @@ -4053,7 +4081,7 @@ avtStructuredDomainBoundaries::SetIndicesForAMRPatch(int domain, // Add support for T-intersections. // // Gunther H. Weber, Thu Jan 19 14:35:59 PST 2012 -// Select new support for T-intersections by defining +// Select new support for T-intersections by defining // CREATE_GHOSTS_FOR_T_INTERSECTIONS // // Gunther H. Weber, Thu Jun 14 17:31:59 PDT 2012 @@ -4204,7 +4232,7 @@ avtStructuredDomainBoundaries::CalculateBoundaries(void) "computation of neighbors from index extents"); } - // + // // The logic for setting up boundaries across AMR levels and within an // AMR level are similar. So the code is combined into a single loop. // Also, the normal rectilinear case is the same as "within an AMR level". @@ -4382,9 +4410,9 @@ avtStructuredDomainBoundaries::CalculateBoundaries(void) // if the current boundary doesn't apply, skip it if ((axisOffset[0]==-1 && !minFace[0]) || - (axisOffset[0]==+1 && !maxFace[0]) || + (axisOffset[0]==+1 && !maxFace[0]) || (axisOffset[1]==-1 && !minFace[1]) || - (axisOffset[1]==+1 && !maxFace[1]) || + (axisOffset[1]==+1 && !maxFace[1]) || (axisOffset[2]==-1 && !minFace[2]) || (axisOffset[2]==+1 && !maxFace[2])) { @@ -4486,8 +4514,8 @@ avtStructuredDomainBoundaries::CalculateBoundaries(void) // domain the domain to get the extents of // e the extents // -// Programmer: Kathleen Bonnell -// Creation: February 8, 2005 +// Programmer: Kathleen Bonnell +// Creation: February 8, 2005 // // **************************************************************************** @@ -4495,7 +4523,7 @@ void avtStructuredDomainBoundaries::GetExtents(int domain, int e[6]) { int ntotaldomains = (int)wholeBoundary.size(); - + if (domain < 0 || ntotaldomains <= domain) { EXCEPTION2(BadIndexException, domain, ntotaldomains); @@ -4574,11 +4602,11 @@ avtStructuredDomainBoundaries::GetNeighborPresence(int domain, bool *b, // Creation: Dec 15, 2008 // // **************************************************************************** -vector +vector avtStructuredDomainBoundaries::GetNeighbors(int domain) { int ntotaldomains = (int)wholeBoundary.size(); - + if (domain < 0 || ntotaldomains <= domain) { EXCEPTION2(BadIndexException, domain, ntotaldomains); diff --git a/src/avt/Database/Ghost/avtUnstructuredDomainBoundaries.C b/src/avt/Database/Ghost/avtUnstructuredDomainBoundaries.C index 0cbbc28b9e2..0b621c1409b 100644 --- a/src/avt/Database/Ghost/avtUnstructuredDomainBoundaries.C +++ b/src/avt/Database/Ghost/avtUnstructuredDomainBoundaries.C @@ -198,6 +198,13 @@ avtUnstructuredDomainBoundaries::SetSharedPoints(int d1, int d2, // // Programmer: Akira Haddox // Creation: August 11, 2003 +// +// Modifications: +// Justin Privitera, Thu Dec 12 16:30:22 PST 2024 +// Prevent there from being given cells when there are no given points. +// Later logic unconditionally sends cells without checking if points +// exist or not. The correct thing to do is to send 0 for num cells if +// num points is 0. // // **************************************************************************** @@ -225,9 +232,9 @@ avtUnstructuredDomainBoundaries::SetGivenCellsAndPoints(int fromDom, int toDom, else { int sIndex = GetGivenIndex(fromDom, toDom); - + map &smap = sharedPointsMap[sIndex]; - + // Go through and manually insert the points that are not shared. for (size_t i = 0; i < points.size(); ++i) @@ -238,6 +245,11 @@ avtUnstructuredDomainBoundaries::SetGivenCellsAndPoints(int fromDom, int toDom, } } } + + if (givenPoints[index].empty()) + { + givenCells[index].clear(); + } } @@ -299,7 +311,7 @@ CopyPointer(T *src, T *dest, int components, for (i = 1; i < nIter; ++i) *(++dest) = *(++src); } - + // **************************************************************************** // Method: avtUnstructuredDomainBoundaries::ExchangeMesh // @@ -408,9 +420,9 @@ avtUnstructuredDomainBoundaries::ExchangeMeshT(vector domainNum, int i; for (i = 0; i < nTotalDomains; ++i) nGivenPoints += nGainedPoints[i][recvDom]; - + // Create the VTK objects - vtkUnstructuredGrid *outm = vtkUnstructuredGrid::New(); + vtkUnstructuredGrid *outm = vtkUnstructuredGrid::New(); vtkPoints *outp = vtkPoints::New(mesh->GetPoints()->GetDataType()); outm->DeepCopy(meshes[d]); @@ -433,15 +445,15 @@ avtUnstructuredDomainBoundaries::ExchangeMeshT(vector domainNum, { if (sendDom == recvDom) continue; - + int nGivenPointsThisDomain = nGainedPoints[sendDom][recvDom]; if (nGivenPointsThisDomain == 0) continue; - + // We need to remember what the point id for this exchange // of points is. startingPoint[pair(sendDom, recvDom)] = newId; - + T *pts = gainedPoints[sendDom][recvDom]; int *origPointIdsThisDomain = origPointIds[sendDom][recvDom]; @@ -450,14 +462,14 @@ avtUnstructuredDomainBoundaries::ExchangeMeshT(vector domainNum, *(newcoord++) = *(pts++); *(newcoord++) = *(pts++); *(newcoord++) = *(pts++); - translatedPointsMap[sendDom][origPointIdsThisDomain[i]] = + translatedPointsMap[sendDom][origPointIdsThisDomain[i]] = newId++; } } - + int nOldCells = outm->GetNumberOfCells(); - + vtkIdList *idList = vtkIdList::New(); // Put in the new cells for (sendDom = 0; sendDom < nTotalDomains; ++sendDom) @@ -469,19 +481,19 @@ avtUnstructuredDomainBoundaries::ExchangeMeshT(vector domainNum, if (nGainedCellsThisDomain == 0) continue; - + // We're going to be be giving cells from sendDom to recvDom. // The id that the cells will be inserted at is // important, and we need to remember. startingCell[pair(sendDom, recvDom)] = outm-> GetNumberOfCells(); - + // We want the map that indexes the ptIds from sendDom into // the ptIds of recvDom. int index = GetGivenIndex(sendDom, recvDom); map &smap = sharedPointsMap[index]; map &tmap = translatedPointsMap[sendDom]; - + for (i = 0; i < nGainedCellsThisDomain; ++i) { int nPointsThisCell = nPointsPerCell[sendDom][recvDom][i]; @@ -493,7 +505,7 @@ avtUnstructuredDomainBoundaries::ExchangeMeshT(vector domainNum, if (smap.find(id) != smap.end()) idList->SetId(k, smap[id]); else - idList->SetId(k, tmap[id]); + idList->SetId(k, tmap[id]); } outm->InsertNextCell(cellTypes[sendDom][recvDom][i], idList); } @@ -518,7 +530,7 @@ avtUnstructuredDomainBoundaries::ExchangeMeshT(vector domainNum, } outm->GetCellData()->AddArray(ghostCells); ghostCells->Delete(); - outm->GetInformation()->Set(vtkStreamingDemandDrivenPipeline::UPDATE_NUMBER_OF_GHOST_LEVELS(), 0); + outm->GetInformation()->Set(vtkStreamingDemandDrivenPipeline::UPDATE_NUMBER_OF_GHOST_LEVELS(), 0); // Rebuild the links now that we've added ghost cells. outm->BuildLinks(); @@ -560,7 +572,7 @@ avtUnstructuredDomainBoundaries::ExchangeMeshT(vector domainNum, delete [] nGainedCells[a]; delete [] nPointsPerCell[a]; } - + delete [] gainedPoints; delete [] cellTypes; delete [] cellPoints; @@ -600,6 +612,12 @@ avtUnstructuredDomainBoundaries::ExchangeMeshT(vector domainNum, // Eric Brugger, Fri Mar 13 15:20:08 PDT 2020 // Modify to handle NULL meshes. // +// Kathleen Biagas, Thu Oct 31, 2024 +// Ensure all procs are calling the same Exchange function. +// +// Kathleen Biagas, Fri Nov 1, 2024 +// Added consistency check for dataTypes. +/// // **************************************************************************** vector @@ -607,22 +625,39 @@ avtUnstructuredDomainBoundaries::ExchangeScalar(vector domainNum, bool isPointData, vector scalars) { - // We're in a bit of a sticky situation if we don't have any actual data. - // Without a valid vtkDataArray, we don't know which ExchangeData to - // call. But if there's no data, nothing will actually be exchanged - // aside from basic communications (eg: domain2proc, MPI_Barrier), - // so we'll choose to call one. - if (!scalars.size()) + int nonNullDomain = 0; + int dataType = -1; + if(!scalars.empty()) { - return ExchangeData_float(domainNum, isPointData, scalars); + while (nonNullDomain < domainNum.size() && scalars[nonNullDomain] == NULL) + nonNullDomain++; + dataType = scalars[nonNullDomain]->GetDataType(); } + + int maxDataType = dataType; +#ifdef PARALLEL + // Let's get them all to agree on one data type. + MPI_Allreduce(&dataType, &maxDataType, 1, MPI_INT, MPI_MAX, VISIT_MPI_COMM); + + int hasDataTypeMismatch = ((dataType >= 0) && (dataType != maxDataType)); + int hasDataTypeMismatchMax = hasDataTypeMismatch; + MPI_Allreduce(&hasDataTypeMismatch, &hasDataTypeMismatchMax, 1, MPI_INT, MPI_MAX, VISIT_MPI_COMM); + if(hasDataTypeMismatchMax) + { + // This should never happen, so throw the exception. + EXCEPTION1(VisItException, + "avtUnstructuredDomainBoundaries:ExchangeScalar " + "vtkDataArray data types do not match."); + } +#endif + + if (maxDataType < 0) + return scalars; + // This one's a little more complicated because there are different // types of scalars we might encounter. If more cases arise, // expand this function. - int nonNullDomain = 0; - while (nonNullDomain < domainNum.size() && scalars[nonNullDomain] == NULL) - nonNullDomain++; - switch (scalars[nonNullDomain]->GetDataType()) + switch (maxDataType) { case VTK_INT: return ExchangeData_int(domainNum, isPointData, scalars); @@ -665,27 +700,50 @@ avtUnstructuredDomainBoundaries::ExchangeScalar(vector domainNum, // Eric Brugger, Fri Mar 13 15:20:08 PDT 2020 // Modify to handle NULL meshes. // +// Kathleen Biagas, Thu Oct 31, 2024 +// Ensure all procs are calling the same Exchange function. +// +// Kathleen Biagas, Fri Nov 1, 2024 +// Added consistency check for dataTypes. +/// // **************************************************************************** vector avtUnstructuredDomainBoundaries::ExchangeVector(vector domainNum, bool isPointData, vector vectors) { - // We're in a bit of a sticky situation if we don't have any actual data. - // Without a valid vtkDataArray, we don't know which ExchangeData to - // call. But if there's no data, nothing will actually be exchanged - // aside from basic communications (eg: domain2proc, MPI_Barrier), - // so we'll choose to call one. - if (!vectors.size()) + int nonNullDomain = 0; + int dataType = -1; + if(!vectors.empty()) { - return ExchangeFloatVector(domainNum, isPointData, vectors); + while (nonNullDomain < domainNum.size() && vectors[nonNullDomain] == NULL) + nonNullDomain++; + dataType = vectors[nonNullDomain]->GetDataType(); } + + int maxDataType = dataType; +#ifdef PARALLEL + // Let's get them all to agree on one data type. + MPI_Allreduce(&dataType, &maxDataType, 1, MPI_INT, MPI_MAX, VISIT_MPI_COMM); + + int hasDataTypeMismatch = ((dataType >= 0) && (dataType != maxDataType)); + int hasDataTypeMismatchMax = hasDataTypeMismatch; + MPI_Allreduce(&hasDataTypeMismatch, &hasDataTypeMismatchMax, 1, MPI_INT, MPI_MAX, VISIT_MPI_COMM); + if(hasDataTypeMismatchMax) + { + // This should never happen, so throw the exception. + EXCEPTION1(VisItException, + "avtUnstructuredDomainBoundaries:ExchangeVector " + "vtkDataArray data types do not match."); + } +#endif + + if (maxDataType < 0) + return vectors; + // This one's a little more complicated because there are different // types of vectors we might encounter. If more cases arise, // expand this function. - int nonNullDomain = 0; - while (nonNullDomain < domainNum.size() && vectors[nonNullDomain] == NULL) - nonNullDomain++; - switch (vectors[nonNullDomain]->GetDataType()) + switch (maxDataType) { case VTK_FLOAT: return ExchangeFloatVector(domainNum, isPointData, vectors); @@ -803,7 +861,7 @@ avtUnstructuredDomainBoundaries::ExchangeIntVector(vector domainNum, // // Purpose: // Exchange the ghost zone information for some materials, -// returning the new ones. +// returning the new ones. // // Arguments: // domainNum an array of domain numbers for each mesh @@ -845,7 +903,7 @@ avtUnstructuredDomainBoundaries::ExchangeMaterial(vector domainNum, // // Purpose: // Exchange the ghost zone information for some materials, -// returning the new ones. +// returning the new ones. // // Arguments: // domainNum an array of domain numbers for each mesh @@ -888,10 +946,10 @@ avtUnstructuredDomainBoundaries::ExchangeMixedMaterials(vector domainNum, avtMaterial *oldMat = mats[i]; if (oldMat == NULL) continue; - + // // Estimate the sizes we will need for the new object. - // + // int oldNCells = oldMat->GetNZones(); int oldMixlen = oldMat->GetMixlen(); int newNCells = oldNCells; @@ -962,9 +1020,9 @@ avtUnstructuredDomainBoundaries::ExchangeMixedMaterials(vector domainNum, } } - out[i] = new avtMaterial(oldMat->GetNMaterials(), - oldMat->GetMaterials(), newNCells, - new_matlist, newMixlen, new_mix_mat, + out[i] = new avtMaterial(oldMat->GetNMaterials(), + oldMat->GetMaterials(), newNCells, + new_matlist, newMixlen, new_mix_mat, new_mix_next, new_mix_zone, new_mix_vf); delete [] new_matlist; @@ -973,7 +1031,7 @@ avtUnstructuredDomainBoundaries::ExchangeMixedMaterials(vector domainNum, delete [] new_mix_zone; delete [] new_mix_vf; } - + // Cleanup memory ... a bit of work. if (nGainedCells != NULL) { @@ -1035,7 +1093,7 @@ avtUnstructuredDomainBoundaries::ExchangeMixedMaterials(vector domainNum, // // Purpose: // Exchange the ghost zone information for some materials, -// returning the new ones. +// returning the new ones. // // Arguments: // domainNum an array of domain numbers for each mesh @@ -1072,7 +1130,7 @@ avtUnstructuredDomainBoundaries::ExchangeCleanMaterials(vector domainNum, { if (mats[i] == NULL) continue; - + // This should never happen, but it doesn't hurt to check. if (mats[i]->GetMixlen() != 0) { @@ -1102,11 +1160,11 @@ avtUnstructuredDomainBoundaries::ExchangeCleanMaterials(vector domainNum, { if (mats[i] == NULL) continue; - + int nMaterials = mats[i]->GetNMaterials(); int nZones = result[i]->GetNumberOfTuples(); int *matPtr = (int *)(result[i]->GetVoidPointer(0)); - + out[i] = new avtMaterial(nMaterials, mats[i]->GetMaterials(), nZones, matPtr, 0, NULL, NULL, NULL, NULL); @@ -1114,7 +1172,7 @@ avtUnstructuredDomainBoundaries::ExchangeCleanMaterials(vector domainNum, materialArrays[i]->Delete(); result[i]->Delete(); } - + return out; } @@ -1124,7 +1182,7 @@ avtUnstructuredDomainBoundaries::ExchangeCleanMaterials(vector domainNum, // // Purpose: // Exchange the ghost zone information for some mixvars, -// returning the new ones. +// returning the new ones. // // Arguments: // domainNum an array of domain numbers for each mesh @@ -1139,7 +1197,7 @@ avtUnstructuredDomainBoundaries::ExchangeCleanMaterials(vector domainNum, // Hank Childs, Tue Mar 4 13:29:48 PST 2008 // Account for domains that do not have mixed variables. // -// Kathleen Bonnell, Thu Apr 10 17:56:33 PDT 2008 +// Kathleen Bonnell, Thu Apr 10 17:56:33 PDT 2008 // Removed redefinition of 'i'. // // **************************************************************************** @@ -1232,10 +1290,10 @@ avtUnstructuredDomainBoundaries::ExchangeMixVar(vector domainNum, // for (int j = 0 ; j < nTotalDomains ; j++) { - memcpy(new_buff+mixlen_cnt, vals[j][domainNum[i]], + memcpy(new_buff+mixlen_cnt, vals[j][domainNum[i]], sizeof(float)*nGainedMixlen[j][domainNum[i]]); mixlen_cnt += nGainedMixlen[j][domainNum[i]]; - } + } out[i] = new avtMixedVariable(new_buff, newMixlen,mixvarname); delete [] new_buff; @@ -1349,19 +1407,19 @@ avtUnstructuredDomainBoundaries::ConfirmMesh(vector domainNum, meshes[j]->GetPoint(d2ptId, pt2); const double epsilon = 1e-12; - + // If these points are too dis-similar, it has to be // referring another mesh. if (fabs(pt1[0] - pt2[0]) + fabs(pt1[1] - pt2[1]) + fabs(pt1[2] - pt2[2]) > epsilon) return false; - + // If we reached this point, then we've tested this pair of // domains. break; } } - + return true; } @@ -1387,7 +1445,7 @@ avtUnstructuredDomainBoundaries::ConfirmMesh(vector domainNum, // Brad Whitlock, Thu Sep 16 12:58:27 PDT 2004 // I added conditionally compiled code to work around an apparent template // instantiation bug that in the MSVC6.0 compiler that prevented VisIt -// from building on Windows. I added an argument to contribute to the +// from building on Windows. I added an argument to contribute to the // method signature and the contents of CommunicateDataInformation, // which had to be inlined to get it to compile on Windows. // @@ -1434,7 +1492,7 @@ avtUnstructuredDomainBoundaries::ExchangeData(vector &domainNum, out[i]->DeepCopy(data[i]); out[i]->SetName(data[i]->GetName()); - + int sendDom; int nGivenTuples = 0; @@ -1445,7 +1503,7 @@ avtUnstructuredDomainBoundaries::ExchangeData(vector &domainNum, nGivenTuples += nGainedTuples[sendDom][recvDom]; } - + if (nGivenTuples > 0) { out[i]->Resize(nGivenTuples + out[i]->GetNumberOfTuples()); @@ -1628,7 +1686,7 @@ avtUnstructuredDomainBoundaries::CommunicateMeshInformation( nPointsPerCell = new int **[nTotalDomains]; vtkIdList *idList = vtkIdList::New(); - + for (int sendDom = 0; sendDom < nTotalDomains; ++sendDom) { gainedPoints[sendDom] = new T*[nTotalDomains]; @@ -1650,7 +1708,7 @@ avtUnstructuredDomainBoundaries::CommunicateMeshInformation( nGainedPoints[sendDom][recvDom] = 0; nGainedCells[sendDom][recvDom] = 0; - + // Cases where no computation is required. if (sendDom == recvDom) continue; @@ -1665,9 +1723,9 @@ avtUnstructuredDomainBoundaries::CommunicateMeshInformation( for (i = 0; i < domainNum.size(); ++i) if (domainNum[i] == sendDom) break; - + vtkUnstructuredGrid *givingUg = (vtkUnstructuredGrid*)meshes[i]; - + int index = GetGivenIndex(sendDom, recvDom); // If no domain boundary, then there's no work to do. @@ -1676,7 +1734,7 @@ avtUnstructuredDomainBoundaries::CommunicateMeshInformation( size_t nPts = givenPoints[index].size(); nGainedPoints[sendDom][recvDom] += (int) nPts; - + gainedPoints[sendDom][recvDom] = new T[nPts * 3]; origPointIds[sendDom][recvDom] = new int[nPts]; @@ -1687,7 +1745,7 @@ avtUnstructuredDomainBoundaries::CommunicateMeshInformation( for (i = 0; i < nPts; ++i) { *(origIdPtr++) = givenPoints[index][i]; - + T *ptPtr = fromPtr + 3 * givenPoints[index][i]; *(gainedPtr++) = *(ptPtr++); *(gainedPtr++) = *(ptPtr++); @@ -1702,8 +1760,8 @@ avtUnstructuredDomainBoundaries::CommunicateMeshInformation( nPointsPerCell[sendDom][recvDom] = new int[nCells]; int *cellPtr = cellTypes[sendDom][recvDom]; - int **cellPtsPtr = cellPoints[sendDom][recvDom]; - int *nPtsPerCellPtr = nPointsPerCell[sendDom][recvDom]; + int **cellPtsPtr = cellPoints[sendDom][recvDom]; + int *nPtsPerCellPtr = nPointsPerCell[sendDom][recvDom]; for (i = 0; i < nCells; ++i) { @@ -1734,7 +1792,7 @@ avtUnstructuredDomainBoundaries::CommunicateMeshInformation( if (nPts == 0) continue; - + nGainedPoints[sendDom][recvDom] += nPts; gainedPoints[sendDom][recvDom] = new T[nPts * 3]; origPointIds[sendDom][recvDom] = new int[nPts]; @@ -1751,9 +1809,9 @@ avtUnstructuredDomainBoundaries::CommunicateMeshInformation( int nCells; MPI_Recv(&nCells, 1, MPI_INT, fRank, mpiNumGivenCellsTag, VISIT_MPI_COMM, &stat); - + nGainedCells[sendDom][recvDom] += nCells; - + cellTypes[sendDom][recvDom] = new int[nCells]; cellPoints[sendDom][recvDom] = new int *[nCells]; nPointsPerCell[sendDom][recvDom] = new int[nCells]; @@ -1771,7 +1829,7 @@ avtUnstructuredDomainBoundaries::CommunicateMeshInformation( int pntArrSize = 0; for (k = 0; k < nCells; ++k) { - cellPoints[sendDom][recvDom][k] = + cellPoints[sendDom][recvDom][k] = new int [nPointsPerCell[sendDom][recvDom][k]]; pntArrSize += nPointsPerCell[sendDom][recvDom][k]; } @@ -1797,8 +1855,8 @@ avtUnstructuredDomainBoundaries::CommunicateMeshInformation( MPI_Datatype type = GetMPIDataType(); int tRank = domain2proc[recvDom]; - int index = GetGivenIndex(sendDom, recvDom); - + int index = GetGivenIndex(sendDom, recvDom); + // If no domain boundary, send 0 for nPts, and continue // Also continue if there are no given points. if (index < 0 || givenPoints[index].size() == 0) @@ -1830,7 +1888,7 @@ avtUnstructuredDomainBoundaries::CommunicateMeshInformation( for (k = 0; k < nPts; ++k) { *(origIdPtr++) = givenPoints[index][k]; - + T *ptPtr = fromPtr + 3 * givenPoints[index][k]; *(gainedPtr++) = *(ptPtr++); *(gainedPtr++) = *(ptPtr++); @@ -1838,21 +1896,21 @@ avtUnstructuredDomainBoundaries::CommunicateMeshInformation( } // Send the number of points given - MPI_Send(&nPts, 1, MPI_INT, tRank, mpiNPtsTag, VISIT_MPI_COMM); - + MPI_Send(&nPts, 1, MPI_INT, tRank, mpiNPtsTag, VISIT_MPI_COMM); + // Send the gained points - MPI_Send(gainedPtrStart, nPts * 3, type, tRank, + MPI_Send(gainedPtrStart, nPts * 3, type, tRank, mpiGainedPointsTag, VISIT_MPI_COMM); - + // Send the original ids for the gained points - MPI_Send(origIdPtrStart, nPts, MPI_INT, tRank, + MPI_Send(origIdPtrStart, nPts, MPI_INT, tRank, mpiOriginalIdsTag, VISIT_MPI_COMM); // Send the number of given cells int nCells = (int)givenCells[index].size(); - MPI_Send(&nCells, 1, MPI_INT, tRank, mpiNumGivenCellsTag, + MPI_Send(&nCells, 1, MPI_INT, tRank, mpiNumGivenCellsTag, VISIT_MPI_COMM); - + // Prepare for sending the cell info int *cellPtr = new int[nCells]; vector cellPtsVector; @@ -1869,8 +1927,8 @@ avtUnstructuredDomainBoundaries::CommunicateMeshInformation( for (int k = 0; k < nPts; ++k) cellPtsVector.push_back(idList->GetId(k)); } - - + + // Send the cell types MPI_Send(cellPtr, nCells, MPI_INT, tRank, mpiCellTypesTag, VISIT_MPI_COMM); @@ -1905,7 +1963,7 @@ avtUnstructuredDomainBoundaries::CommunicateMeshInformation( // Method: avtUnstructuredDomainBoundaries::CommunicateMixvarInformation // // Purpose: -// Send and collect information needed to exchange mixed variables. +// Send and collect information needed to exchange mixed variables. // // Notes: // Returned arguments should be passed in as uninitialized pointers. @@ -1979,7 +2037,7 @@ avtUnstructuredDomainBoundaries::CommunicateMixvarInformation( for (i = 0 ; i < domainNum.size() ; i++) if (domainNum[i] == sendDom) break; - + int index = GetGivenIndex(sendDom, recvDom); // If no domain boundary, then there's no work to do. @@ -1987,7 +2045,7 @@ avtUnstructuredDomainBoundaries::CommunicateMixvarInformation( continue; avtMixedVariable *givingVar = mixvars[i]; - + size_t nCells = givenCells[index].size(); // Assess the amount of mix in cells along the boundary. @@ -2017,7 +2075,7 @@ avtUnstructuredDomainBoundaries::CommunicateMixvarInformation( if (nmats >= 1000) { char str[1024]; - snprintf(str, 1024, + snprintf(str, 1024, "The mixed material entry for cell %d " "of domain %d appears to be invalid. Unable " "to proceed.", givenCells[index][i], sendDom); @@ -2063,7 +2121,7 @@ avtUnstructuredDomainBoundaries::CommunicateMixvarInformation( if (amt == 0) continue; - + mixGained[sendDom][recvDom] = amt; vals[sendDom][recvDom] = new float[amt]; // Get the gained materials @@ -2073,11 +2131,11 @@ avtUnstructuredDomainBoundaries::CommunicateMixvarInformation( // If this process owns the sending domain, we send information. else if (domain2proc[sendDom] == rank) { - + int tRank = domain2proc[recvDom]; - int index = GetGivenIndex(sendDom, recvDom); - + int index = GetGivenIndex(sendDom, recvDom); + // If no domain boundary, send 0 for nPts, and continue // Also continue if there are no given points. int amt = 0; @@ -2092,7 +2150,7 @@ avtUnstructuredDomainBoundaries::CommunicateMixvarInformation( break; avtMixedVariable *givingVar = mixvars[i]; - + size_t nCells = givenCells[index].size(); // Assess the amount of mix in cells along the boundary. @@ -2122,7 +2180,7 @@ avtUnstructuredDomainBoundaries::CommunicateMixvarInformation( if (nmats >= 1000) { char str[1024]; - snprintf(str, 1024, + snprintf(str, 1024, "The mixed material entry for cell %d " "of domain %d appears to be invalid. Unable " "to proceed.", givenCells[index][i], sendDom); @@ -2212,7 +2270,7 @@ avtUnstructuredDomainBoundaries::CommunicateMaterialInformation( const vector &domainNum, const vector &mats, int **&nGainedCells, int **&nGainedMixlen, - int ***&gainedMatlist, int ***&gainedMixmat, + int ***&gainedMatlist, int ***&gainedMixmat, float ***&gainedMixvf) { // Get the processor rank @@ -2247,7 +2305,7 @@ avtUnstructuredDomainBoundaries::CommunicateMaterialInformation( gainedMatlist[sendDom][recvDom] = NULL; gainedMixmat[sendDom][recvDom] = NULL; gainedMixvf[sendDom][recvDom] = NULL; - + nGainedCells[sendDom][recvDom] = 0; nGainedMixlen[sendDom][recvDom] = 0; @@ -2266,7 +2324,7 @@ avtUnstructuredDomainBoundaries::CommunicateMaterialInformation( for (i = 0 ; i < domainNum.size() ; i++) if (domainNum[i] == sendDom) break; - + int index = GetGivenIndex(sendDom, recvDom); // If no domain boundary, then there's no work to do. @@ -2274,7 +2332,7 @@ avtUnstructuredDomainBoundaries::CommunicateMaterialInformation( continue; avtMaterial *givingMat = mats[i]; - + size_t nCells = givenCells[index].size(); nGainedCells[sendDom][recvDom] = (int)nCells; @@ -2299,7 +2357,7 @@ avtUnstructuredDomainBoundaries::CommunicateMaterialInformation( if (nmats >= 1000) { char str[1024]; - snprintf(str, 1024, + snprintf(str, 1024, "The mixed material entry for cell %d " "of domain %d appears to be invalid. Unable " "to proceed.", givenCells[index][i], sendDom); @@ -2307,7 +2365,7 @@ avtUnstructuredDomainBoundaries::CommunicateMaterialInformation( } } nGainedMixlen[sendDom][recvDom] = nMixlen; - + gainedMatlist[sendDom][recvDom] = new int[nCells]; gainedMixmat[sendDom][recvDom] = new int[nMixlen]; gainedMixvf[sendDom][recvDom] = new float[nMixlen]; @@ -2362,7 +2420,7 @@ avtUnstructuredDomainBoundaries::CommunicateMaterialInformation( if (amt[0] == 0 && amt[1] == 0) continue; - + nGainedCells[sendDom][recvDom] += amt[0]; nGainedMixlen[sendDom][recvDom] += amt[1]; @@ -2388,8 +2446,8 @@ avtUnstructuredDomainBoundaries::CommunicateMaterialInformation( int tRank = domain2proc[recvDom]; - int index = GetGivenIndex(sendDom, recvDom); - + int index = GetGivenIndex(sendDom, recvDom); + // If no domain boundary, send 0 for nPts, and continue // Also continue if there are no given points. int amt[2] = { 0, 0 }; @@ -2398,15 +2456,15 @@ avtUnstructuredDomainBoundaries::CommunicateMaterialInformation( MPI_Send(amt, 2, MPI_INT,tRank,mpiNDataTag,VISIT_MPI_COMM); continue; } - + int i = 0; - + for (i = 0; i < (int)domainNum.size(); ++i) if (domainNum[i] == sendDom) break; avtMaterial *givingMat = mats[i]; - + int nCells = (int)givenCells[index].size(); nGainedCells[sendDom][recvDom] = nCells; @@ -2431,7 +2489,7 @@ avtUnstructuredDomainBoundaries::CommunicateMaterialInformation( if (nmats >= 1000) { char str[1024]; - snprintf(str, 1024, + snprintf(str, 1024, "The mixed material entry for cell %d " "of domain %d appears to be invalid. Unable " "to proceed.", givenCells[index][i], sendDom); @@ -2439,11 +2497,11 @@ avtUnstructuredDomainBoundaries::CommunicateMaterialInformation( } } nGainedMixlen[sendDom][recvDom] = nMixlen; - + amt[0] = nCells; amt[1] = nMixlen; MPI_Send(amt, 2, MPI_INT,tRank,mpiNDataTag,VISIT_MPI_COMM); - + int *givenMatlist = new int[nCells]; int *givenMixmat = new int[nMixlen]; float *givenMixvf = new float[nMixlen]; @@ -2599,7 +2657,7 @@ avtUnstructuredDomainBoundaries::CommunicateDataInformation( // calculation: no communication needed if (domain2proc[sendDom] == rank && domain2proc[recvDom] == rank) { - size_t i = 0; + size_t i = 0; for (i = 0; i < domainNum.size(); ++i) if (domainNum[i] == sendDom) break; @@ -2610,14 +2668,14 @@ avtUnstructuredDomainBoundaries::CommunicateDataInformation( if (index < 0) continue; - vector &mapRef = isPointData ? givenPoints[index] + vector &mapRef = isPointData ? givenPoints[index] : givenCells[index]; - + int nTuples =(int) mapRef.size(); nGainedTuples[sendDom][recvDom] = nTuples; gainedData[sendDom][recvDom] = new T[nTuples * nComponents]; - + T * origPtr = (T*)(data[i]->GetVoidPointer(0)); T * dataPtr = gainedData[sendDom][recvDom]; @@ -2645,7 +2703,7 @@ avtUnstructuredDomainBoundaries::CommunicateDataInformation( int nTup; MPI_Recv(&nTup, 1, MPI_INT, fRank, mpiNumTuplesTag, VISIT_MPI_COMM, &stat); - + if (nTup == 0) continue; @@ -2711,7 +2769,7 @@ avtUnstructuredDomainBoundaries::CommunicateDataInformation( delete [] dataArr; } -#endif +#endif } } diff --git a/src/avt/Expressions/Abstract/avtExpressionDataTreeIterator.C b/src/avt/Expressions/Abstract/avtExpressionDataTreeIterator.C index edd41509166..7c47a777126 100644 --- a/src/avt/Expressions/Abstract/avtExpressionDataTreeIterator.C +++ b/src/avt/Expressions/Abstract/avtExpressionDataTreeIterator.C @@ -22,6 +22,7 @@ #include +#include // for HAVE_LIBVTKM #ifdef HAVE_LIBVTKM #include #endif diff --git a/src/avt/Filters/avtContourFilter.C b/src/avt/Filters/avtContourFilter.C index fd5b7fdb7d3..c0504ed0eb2 100644 --- a/src/avt/Filters/avtContourFilter.C +++ b/src/avt/Filters/avtContourFilter.C @@ -12,6 +12,7 @@ #include #include +#include // for HAVE_LIBVTKM #ifdef HAVE_LIBVTKM #include #include diff --git a/src/avt/Filters/avtThresholdFilter.C b/src/avt/Filters/avtThresholdFilter.C index 79a09c666e1..7ed5e403e23 100644 --- a/src/avt/Filters/avtThresholdFilter.C +++ b/src/avt/Filters/avtThresholdFilter.C @@ -36,6 +36,7 @@ #include #include +#include // for HAVE_LIBVTKM #ifdef HAVE_LIBVTKM #include #include diff --git a/src/operators/AMRStitchCell/AMRStitchCell.xml b/src/operators/AMRStitchCell/AMRStitchCell.xml index 948ef29e2d4..7a5bd7b4ec7 100644 --- a/src/operators/AMRStitchCell/AMRStitchCell.xml +++ b/src/operators/AMRStitchCell/AMRStitchCell.xml @@ -1,10 +1,6 @@ - - ${VISIT_INCLUDE_DIR}/avt/Database/Ghost - - avtAMRStitchCellFilter.C AMRStitchCellTesselations3D.C AMRStitchCellTesselations2D.C diff --git a/src/operators/AMRStitchCell/CMakeLists.txt b/src/operators/AMRStitchCell/CMakeLists.txt index bb5299eaf02..558511ebb73 100644 --- a/src/operators/AMRStitchCell/CMakeLists.txt +++ b/src/operators/AMRStitchCell/CMakeLists.txt @@ -1,93 +1,7 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(AMRStitchCell_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(AMRStitchCell) - -SET(COMMON_SOURCES -AMRStitchCellPluginInfo.C -AMRStitchCellCommonPluginInfo.C -AMRStitchCellAttributes.C -) - -SET(LIBI_SOURCES -AMRStitchCellPluginInfo.C -) - -SET(LIBG_SOURCES -AMRStitchCellGUIPluginInfo.C -QvisAMRStitchCellWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -AMRStitchCellViewerEnginePluginInfo.C -AMRStitchCellViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -AMRStitchCellViewerEnginePluginInfo.C -AMRStitchCellEnginePluginInfo.C -avtAMRStitchCellFilter.C -AMRStitchCellTesselations3D.C -AMRStitchCellTesselations2D.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -${VISIT_INCLUDE_DIR}/avt/Database/Ghost -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IAMRStitchCellOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IAMRStitchCellOperator visitcommon) -SET(INSTALLTARGETS IAMRStitchCellOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GAMRStitchCellOperator ${LIBG_SOURCES}) - set_target_properties(GAMRStitchCellOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GAMRStitchCellOperator visitcommon gui ) - - ADD_LIBRARY(VAMRStitchCellOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VAMRStitchCellOperator VIEWER) - TARGET_LINK_LIBRARIES(VAMRStitchCellOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GAMRStitchCellOperator VAMRStitchCellOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - AMRStitchCellScriptingPluginInfo.C - PyAMRStitchCellAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SAMRStitchCellOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SAMRStitchCellOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SAMRStitchCellOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY AMRStitchCellAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaAMRStitchCell ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} AMRStitchCellAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EAMRStitchCellOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EAMRStitchCellOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EAMRStitchCellOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EAMRStitchCellOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EAMRStitchCellOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EAMRStitchCellOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators AMRStitchCell ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME AMRStitchCell + ESRC AMRStitchCellTesselations3D.C + AMRStitchCellTesselations2D.C + DEFINES ${AMRStitchCell_DEFINES}) diff --git a/src/operators/AxisAlignedSlice4D/CMakeLists.txt b/src/operators/AxisAlignedSlice4D/CMakeLists.txt index 628e1dca03b..c94cbb53ce7 100644 --- a/src/operators/AxisAlignedSlice4D/CMakeLists.txt +++ b/src/operators/AxisAlignedSlice4D/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(AxisAlignedSlice4D_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(AxisAlignedSlice4D) - -SET(COMMON_SOURCES -AxisAlignedSlice4DPluginInfo.C -AxisAlignedSlice4DCommonPluginInfo.C -AxisAlignedSlice4DAttributes.C -) - -SET(LIBI_SOURCES -AxisAlignedSlice4DPluginInfo.C -) - -SET(LIBG_SOURCES -AxisAlignedSlice4DGUIPluginInfo.C -QvisAxisAlignedSlice4DWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -AxisAlignedSlice4DViewerEnginePluginInfo.C -AxisAlignedSlice4DViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -AxisAlignedSlice4DViewerEnginePluginInfo.C -AxisAlignedSlice4DEnginePluginInfo.C -avtAxisAlignedSlice4DFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IAxisAlignedSlice4DOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IAxisAlignedSlice4DOperator visitcommon) -SET(INSTALLTARGETS IAxisAlignedSlice4DOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GAxisAlignedSlice4DOperator ${LIBG_SOURCES}) - set_target_properties(GAxisAlignedSlice4DOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GAxisAlignedSlice4DOperator visitcommon gui ) - - ADD_LIBRARY(VAxisAlignedSlice4DOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VAxisAlignedSlice4DOperator VIEWER) - TARGET_LINK_LIBRARIES(VAxisAlignedSlice4DOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GAxisAlignedSlice4DOperator VAxisAlignedSlice4DOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - AxisAlignedSlice4DScriptingPluginInfo.C - PyAxisAlignedSlice4DAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SAxisAlignedSlice4DOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SAxisAlignedSlice4DOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SAxisAlignedSlice4DOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY AxisAlignedSlice4DAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaAxisAlignedSlice4D ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} AxisAlignedSlice4DAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EAxisAlignedSlice4DOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EAxisAlignedSlice4DOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EAxisAlignedSlice4DOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EAxisAlignedSlice4DOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EAxisAlignedSlice4DOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EAxisAlignedSlice4DOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators AxisAlignedSlice4D ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME AxisAlignedSlice4D + DEFINES ${AxisAlignedSlice4D_DEFINES}) diff --git a/src/operators/BoundaryOp/CMakeLists.txt b/src/operators/BoundaryOp/CMakeLists.txt index 33599a29e82..9fa55548d4e 100644 --- a/src/operators/BoundaryOp/CMakeLists.txt +++ b/src/operators/BoundaryOp/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(BoundaryOp_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(BoundaryOp) - -SET(COMMON_SOURCES -BoundaryOpPluginInfo.C -BoundaryOpCommonPluginInfo.C -BoundaryOpAttributes.C -) - -SET(LIBI_SOURCES -BoundaryOpPluginInfo.C -) - -SET(LIBG_SOURCES -BoundaryOpGUIPluginInfo.C -QvisBoundaryOpWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -BoundaryOpViewerEnginePluginInfo.C -BoundaryOpViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -BoundaryOpViewerEnginePluginInfo.C -BoundaryOpEnginePluginInfo.C -avtBoundaryOpFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IBoundaryOpOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IBoundaryOpOperator visitcommon) -SET(INSTALLTARGETS IBoundaryOpOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GBoundaryOpOperator ${LIBG_SOURCES}) - set_target_properties(GBoundaryOpOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GBoundaryOpOperator visitcommon gui ) - - ADD_LIBRARY(VBoundaryOpOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VBoundaryOpOperator VIEWER) - TARGET_LINK_LIBRARIES(VBoundaryOpOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GBoundaryOpOperator VBoundaryOpOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - BoundaryOpScriptingPluginInfo.C - PyBoundaryOpAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SBoundaryOpOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SBoundaryOpOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SBoundaryOpOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY BoundaryOpAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaBoundaryOp ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} BoundaryOpAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EBoundaryOpOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EBoundaryOpOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EBoundaryOpOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EBoundaryOpOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EBoundaryOpOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EBoundaryOpOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators BoundaryOp ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME BoundaryOp + DEFINES ${BoundaryOp_DEFINES}) diff --git a/src/operators/Box/CMakeLists.txt b/src/operators/Box/CMakeLists.txt index c92a0637266..88ebc8d9f79 100644 --- a/src/operators/Box/CMakeLists.txt +++ b/src/operators/Box/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(Box_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(Box) - -SET(COMMON_SOURCES -BoxPluginInfo.C -BoxCommonPluginInfo.C -BoxAttributes.C -) - -SET(LIBI_SOURCES -BoxPluginInfo.C -) - -SET(LIBG_SOURCES -BoxGUIPluginInfo.C -QvisBoxWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -BoxViewerEnginePluginInfo.C -BoxViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -BoxViewerEnginePluginInfo.C -BoxEnginePluginInfo.C -avtBoxFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IBoxOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IBoxOperator visitcommon) -SET(INSTALLTARGETS IBoxOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GBoxOperator ${LIBG_SOURCES}) - set_target_properties(GBoxOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GBoxOperator visitcommon gui ) - - ADD_LIBRARY(VBoxOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VBoxOperator VIEWER) - TARGET_LINK_LIBRARIES(VBoxOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GBoxOperator VBoxOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - BoxScriptingPluginInfo.C - PyBoxAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SBoxOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SBoxOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SBoxOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY BoxAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaBox ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} BoxAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EBoxOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EBoxOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EBoxOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EBoxOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EBoxOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EBoxOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators Box ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME Box + DEFINES ${Box_DEFINES}) diff --git a/src/operators/CartographicProjection/CMakeLists.txt b/src/operators/CartographicProjection/CMakeLists.txt index 722fef78579..6d4b5c1958f 100644 --- a/src/operators/CartographicProjection/CMakeLists.txt +++ b/src/operators/CartographicProjection/CMakeLists.txt @@ -1,96 +1,7 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(CartographicProjection_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(CartographicProjection) - -SET(COMMON_SOURCES -CartographicProjectionPluginInfo.C -CartographicProjectionCommonPluginInfo.C -CartographicProjectionAttributes.C -) - -SET(LIBI_SOURCES -CartographicProjectionPluginInfo.C -) - -SET(LIBG_SOURCES -CartographicProjectionGUIPluginInfo.C -QvisCartographicProjectionWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -CartographicProjectionViewerEnginePluginInfo.C -CartographicProjectionViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -CartographicProjectionViewerEnginePluginInfo.C -CartographicProjectionEnginePluginInfo.C -avtCartographicProjectionFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(ICartographicProjectionOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(ICartographicProjectionOperator visitcommon) -SET(INSTALLTARGETS ICartographicProjectionOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GCartographicProjectionOperator ${LIBG_SOURCES}) - set_target_properties(GCartographicProjectionOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GCartographicProjectionOperator visitcommon gui ) - - ADD_LIBRARY(VCartographicProjectionOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VCartographicProjectionOperator VIEWER) - TARGET_LINK_LIBRARIES(VCartographicProjectionOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GCartographicProjectionOperator VCartographicProjectionOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - CartographicProjectionScriptingPluginInfo.C - PyCartographicProjectionAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SCartographicProjectionOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SCartographicProjectionOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SCartographicProjectionOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY CartographicProjectionAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaCartographicProjection ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} CartographicProjectionAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(ECartographicProjectionOperator_ser ${LIBE_SOURCES}) - -set(vtk_elibsSer VTK::GeovisCore ) - -TARGET_LINK_LIBRARIES(ECartographicProjectionOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ${vtk_elibsSer} ) -SET(INSTALLTARGETS ${INSTALLTARGETS} ECartographicProjectionOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(ECartographicProjectionOperator_par ${LIBE_SOURCES}) - - set(vtk_elibsPar VTK::GeovisCore ) - - TARGET_LINK_LIBRARIES(ECartographicProjectionOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ${vtk_elibsPar} ) - SET(INSTALLTARGETS ${INSTALLTARGETS} ECartographicProjectionOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators CartographicProjection ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME CartographicProjection + DEFINES ${CartographicProjection_DEFINES} + ESERLIBS VTK::GeovisCore + EPARLIBS VTK::GeovisCore) diff --git a/src/operators/Clip/CMakeLists.txt b/src/operators/Clip/CMakeLists.txt index bff9b362ae4..7ae65694637 100644 --- a/src/operators/Clip/CMakeLists.txt +++ b/src/operators/Clip/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(Clip_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(Clip) - -SET(COMMON_SOURCES -ClipPluginInfo.C -ClipCommonPluginInfo.C -ClipAttributes.C -) - -SET(LIBI_SOURCES -ClipPluginInfo.C -) - -SET(LIBG_SOURCES -ClipGUIPluginInfo.C -QvisClipWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -ClipViewerEnginePluginInfo.C -ClipViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -ClipViewerEnginePluginInfo.C -ClipEnginePluginInfo.C -avtClipFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IClipOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IClipOperator visitcommon) -SET(INSTALLTARGETS IClipOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GClipOperator ${LIBG_SOURCES}) - set_target_properties(GClipOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GClipOperator visitcommon gui ) - - ADD_LIBRARY(VClipOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VClipOperator VIEWER) - TARGET_LINK_LIBRARIES(VClipOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GClipOperator VClipOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - ClipScriptingPluginInfo.C - PyClipAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SClipOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SClipOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SClipOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY ClipAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaClip ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} ClipAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EClipOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EClipOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EClipOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EClipOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EClipOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EClipOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators Clip ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME Clip + DEFINES ${Clip_DEFINES}) diff --git a/src/operators/Cone/CMakeLists.txt b/src/operators/Cone/CMakeLists.txt index ea7ee0a6361..18f57fd6ecc 100644 --- a/src/operators/Cone/CMakeLists.txt +++ b/src/operators/Cone/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(Cone_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(Cone) - -SET(COMMON_SOURCES -ConePluginInfo.C -ConeCommonPluginInfo.C -ConeAttributes.C -) - -SET(LIBI_SOURCES -ConePluginInfo.C -) - -SET(LIBG_SOURCES -ConeGUIPluginInfo.C -QvisConeWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -ConeViewerEnginePluginInfo.C -ConeViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -ConeViewerEnginePluginInfo.C -ConeEnginePluginInfo.C -avtConeFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IConeOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IConeOperator visitcommon) -SET(INSTALLTARGETS IConeOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GConeOperator ${LIBG_SOURCES}) - set_target_properties(GConeOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GConeOperator visitcommon gui ) - - ADD_LIBRARY(VConeOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VConeOperator VIEWER) - TARGET_LINK_LIBRARIES(VConeOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GConeOperator VConeOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - ConeScriptingPluginInfo.C - PyConeAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SConeOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SConeOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SConeOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY ConeAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaCone ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} ConeAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EConeOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EConeOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EConeOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EConeOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EConeOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EConeOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators Cone ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME Cone + DEFINES ${Cone_DEFINES}) diff --git a/src/operators/ConnCompReduce/CMakeLists.txt b/src/operators/ConnCompReduce/CMakeLists.txt index a81985c8d3e..c822afe207c 100644 --- a/src/operators/ConnCompReduce/CMakeLists.txt +++ b/src/operators/ConnCompReduce/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(ConnCompReduce_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(ConnCompReduce) - -SET(COMMON_SOURCES -ConnCompReducePluginInfo.C -ConnCompReduceCommonPluginInfo.C -ConnCompReduceAttributes.C -) - -SET(LIBI_SOURCES -ConnCompReducePluginInfo.C -) - -SET(LIBG_SOURCES -ConnCompReduceGUIPluginInfo.C -QvisConnCompReduceWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -ConnCompReduceViewerEnginePluginInfo.C -ConnCompReduceViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -ConnCompReduceViewerEnginePluginInfo.C -ConnCompReduceEnginePluginInfo.C -avtConnCompReduceFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IConnCompReduceOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IConnCompReduceOperator visitcommon) -SET(INSTALLTARGETS IConnCompReduceOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GConnCompReduceOperator ${LIBG_SOURCES}) - set_target_properties(GConnCompReduceOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GConnCompReduceOperator visitcommon gui ) - - ADD_LIBRARY(VConnCompReduceOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VConnCompReduceOperator VIEWER) - TARGET_LINK_LIBRARIES(VConnCompReduceOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GConnCompReduceOperator VConnCompReduceOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - ConnCompReduceScriptingPluginInfo.C - PyConnCompReduceAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SConnCompReduceOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SConnCompReduceOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SConnCompReduceOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY ConnCompReduceAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaConnCompReduce ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} ConnCompReduceAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EConnCompReduceOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EConnCompReduceOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EConnCompReduceOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EConnCompReduceOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EConnCompReduceOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EConnCompReduceOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators ConnCompReduce ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME ConnCompReduce + DEFINES ${ConnCompReduce_DEFINES}) diff --git a/src/operators/ConnectedComponents/CMakeLists.txt b/src/operators/ConnectedComponents/CMakeLists.txt index cf347fe8c0e..a6ac5cb0e74 100644 --- a/src/operators/ConnectedComponents/CMakeLists.txt +++ b/src/operators/ConnectedComponents/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(ConnectedComponents_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(ConnectedComponents) - -SET(COMMON_SOURCES -ConnectedComponentsPluginInfo.C -ConnectedComponentsCommonPluginInfo.C -ConnectedComponentsAttributes.C -) - -SET(LIBI_SOURCES -ConnectedComponentsPluginInfo.C -) - -SET(LIBG_SOURCES -ConnectedComponentsGUIPluginInfo.C -QvisConnectedComponentsWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -ConnectedComponentsViewerEnginePluginInfo.C -ConnectedComponentsViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -ConnectedComponentsViewerEnginePluginInfo.C -ConnectedComponentsEnginePluginInfo.C -avtConnectedComponentsFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IConnectedComponentsOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IConnectedComponentsOperator visitcommon) -SET(INSTALLTARGETS IConnectedComponentsOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GConnectedComponentsOperator ${LIBG_SOURCES}) - set_target_properties(GConnectedComponentsOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GConnectedComponentsOperator visitcommon gui ) - - ADD_LIBRARY(VConnectedComponentsOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VConnectedComponentsOperator VIEWER) - TARGET_LINK_LIBRARIES(VConnectedComponentsOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GConnectedComponentsOperator VConnectedComponentsOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - ConnectedComponentsScriptingPluginInfo.C - PyConnectedComponentsAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SConnectedComponentsOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SConnectedComponentsOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SConnectedComponentsOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY ConnectedComponentsAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaConnectedComponents ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} ConnectedComponentsAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EConnectedComponentsOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EConnectedComponentsOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EConnectedComponentsOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EConnectedComponentsOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EConnectedComponentsOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EConnectedComponentsOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators ConnectedComponents ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME ConnectedComponents + DEFINES ${ConnectedComponents_DEFINES}) diff --git a/src/operators/Context/CMakeLists.txt b/src/operators/Context/CMakeLists.txt index 4969adb11cb..2afdb0dad82 100644 --- a/src/operators/Context/CMakeLists.txt +++ b/src/operators/Context/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(Context_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(Context) - -SET(COMMON_SOURCES -ContextPluginInfo.C -ContextCommonPluginInfo.C -ContextAttributes.C -) - -SET(LIBI_SOURCES -ContextPluginInfo.C -) - -SET(LIBG_SOURCES -ContextGUIPluginInfo.C -QvisContextWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -ContextViewerEnginePluginInfo.C -ContextViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -ContextViewerEnginePluginInfo.C -ContextEnginePluginInfo.C -avtContextFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IContextOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IContextOperator visitcommon) -SET(INSTALLTARGETS IContextOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GContextOperator ${LIBG_SOURCES}) - set_target_properties(GContextOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GContextOperator visitcommon gui ) - - ADD_LIBRARY(VContextOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VContextOperator VIEWER) - TARGET_LINK_LIBRARIES(VContextOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GContextOperator VContextOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - ContextScriptingPluginInfo.C - PyContextAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SContextOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SContextOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SContextOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY ContextAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaContext ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} ContextAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EContextOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EContextOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EContextOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EContextOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EContextOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EContextOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators Context ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME Context + DEFINES ${Context_DEFINES}) diff --git a/src/operators/CoordSwap/CMakeLists.txt b/src/operators/CoordSwap/CMakeLists.txt index d125e884d13..25be41ba586 100644 --- a/src/operators/CoordSwap/CMakeLists.txt +++ b/src/operators/CoordSwap/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(CoordSwap_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(CoordSwap) - -SET(COMMON_SOURCES -CoordSwapPluginInfo.C -CoordSwapCommonPluginInfo.C -CoordSwapAttributes.C -) - -SET(LIBI_SOURCES -CoordSwapPluginInfo.C -) - -SET(LIBG_SOURCES -CoordSwapGUIPluginInfo.C -QvisCoordSwapWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -CoordSwapViewerEnginePluginInfo.C -CoordSwapViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -CoordSwapViewerEnginePluginInfo.C -CoordSwapEnginePluginInfo.C -avtCoordSwapFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(ICoordSwapOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(ICoordSwapOperator visitcommon) -SET(INSTALLTARGETS ICoordSwapOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GCoordSwapOperator ${LIBG_SOURCES}) - set_target_properties(GCoordSwapOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GCoordSwapOperator visitcommon gui ) - - ADD_LIBRARY(VCoordSwapOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VCoordSwapOperator VIEWER) - TARGET_LINK_LIBRARIES(VCoordSwapOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GCoordSwapOperator VCoordSwapOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - CoordSwapScriptingPluginInfo.C - PyCoordSwapAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SCoordSwapOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SCoordSwapOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SCoordSwapOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY CoordSwapAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaCoordSwap ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} CoordSwapAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(ECoordSwapOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(ECoordSwapOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} ECoordSwapOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(ECoordSwapOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(ECoordSwapOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} ECoordSwapOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators CoordSwap ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME CoordSwap + DEFINES ${CoordSwap_DEFINES}) diff --git a/src/operators/CracksClipper/CMakeLists.txt b/src/operators/CracksClipper/CMakeLists.txt index 798186217a9..a47ec8ca0a7 100644 --- a/src/operators/CracksClipper/CMakeLists.txt +++ b/src/operators/CracksClipper/CMakeLists.txt @@ -1,101 +1,9 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(CracksClipper_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(CracksClipper) - -SET(COMMON_SOURCES -CracksClipperPluginInfo.C -CracksClipperCommonPluginInfo.C -CracksClipperAttributes.C -) - -SET(LIBI_SOURCES -CracksClipperPluginInfo.C -) - -SET(LIBG_SOURCES -CracksClipperGUIPluginInfo.C -QvisCracksClipperWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -CracksClipperViewerEnginePluginInfo.C -CracksClipperViewerPluginInfo.C -avtCracksClipperFilter.C -avtRemoveCracksFilter.C -avtCracksDensityFilter.C -vtkCracksClipper.C -vtkCrackWidthFilter.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -CracksClipperViewerEnginePluginInfo.C -CracksClipperEnginePluginInfo.C -avtCracksClipperFilter.C -avtRemoveCracksFilter.C -avtCracksDensityFilter.C -vtkCracksClipper.C -vtkCrackWidthFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(ICracksClipperOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(ICracksClipperOperator visitcommon) -SET(INSTALLTARGETS ICracksClipperOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GCracksClipperOperator ${LIBG_SOURCES}) - set_target_properties(GCracksClipperOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GCracksClipperOperator visitcommon gui ) - - ADD_LIBRARY(VCracksClipperOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VCracksClipperOperator VIEWER) - TARGET_LINK_LIBRARIES(VCracksClipperOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GCracksClipperOperator VCracksClipperOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - CracksClipperScriptingPluginInfo.C - PyCracksClipperAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SCracksClipperOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SCracksClipperOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SCracksClipperOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY CracksClipperAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaCracksClipper ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} CracksClipperAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(ECracksClipperOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(ECracksClipperOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -ADD_TARGET_DEFINITIONS(ECracksClipperOperator_ser ENGINE) -SET(INSTALLTARGETS ${INSTALLTARGETS} ECracksClipperOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(ECracksClipperOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(ECracksClipperOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - ADD_TARGET_DEFINITIONS(ECracksClipperOperator_par ENGINE) - SET(INSTALLTARGETS ${INSTALLTARGETS} ECracksClipperOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators CracksClipper ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME CracksClipper + ESRC avtRemoveCracksFilter.C + avtCracksDensityFilter.C + vtkCracksClipper.C + vtkCrackWidthFilter.C + DEFINES ${CracksClipper_DEFINES}) diff --git a/src/operators/CracksClipper/CracksClipper.xml b/src/operators/CracksClipper/CracksClipper.xml index e4e2e35fe20..2d68e41b761 100644 --- a/src/operators/CracksClipper/CracksClipper.xml +++ b/src/operators/CracksClipper/CracksClipper.xml @@ -1,14 +1,6 @@ - - avtCracksClipperFilter.C - avtRemoveCracksFilter.C - avtCracksDensityFilter.C - vtkCracksClipper.C - vtkCrackWidthFilter.C - - avtCracksClipperFilter.C avtRemoveCracksFilter.C avtCracksDensityFilter.C vtkCracksClipper.C diff --git a/src/operators/CreateBonds/CMakeLists.txt b/src/operators/CreateBonds/CMakeLists.txt index b248c4a589c..5849e2d141b 100644 --- a/src/operators/CreateBonds/CMakeLists.txt +++ b/src/operators/CreateBonds/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(CreateBonds_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(CreateBonds) - -SET(COMMON_SOURCES -CreateBondsPluginInfo.C -CreateBondsCommonPluginInfo.C -CreateBondsAttributes.C -) - -SET(LIBI_SOURCES -CreateBondsPluginInfo.C -) - -SET(LIBG_SOURCES -CreateBondsGUIPluginInfo.C -QvisCreateBondsWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -CreateBondsViewerEnginePluginInfo.C -CreateBondsViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -CreateBondsViewerEnginePluginInfo.C -CreateBondsEnginePluginInfo.C -avtCreateBondsFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(ICreateBondsOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(ICreateBondsOperator visitcommon) -SET(INSTALLTARGETS ICreateBondsOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GCreateBondsOperator ${LIBG_SOURCES}) - set_target_properties(GCreateBondsOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GCreateBondsOperator visitcommon gui ) - - ADD_LIBRARY(VCreateBondsOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VCreateBondsOperator VIEWER) - TARGET_LINK_LIBRARIES(VCreateBondsOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GCreateBondsOperator VCreateBondsOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - CreateBondsScriptingPluginInfo.C - PyCreateBondsAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SCreateBondsOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SCreateBondsOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SCreateBondsOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY CreateBondsAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaCreateBonds ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} CreateBondsAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(ECreateBondsOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(ECreateBondsOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} ECreateBondsOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(ECreateBondsOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(ECreateBondsOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} ECreateBondsOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators CreateBonds ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME CreateBonds + DEFINES ${CreateBonds_DEFINES}) diff --git a/src/operators/Cylinder/CMakeLists.txt b/src/operators/Cylinder/CMakeLists.txt index bb607d72031..cff62e8d778 100644 --- a/src/operators/Cylinder/CMakeLists.txt +++ b/src/operators/Cylinder/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(Cylinder_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(Cylinder) - -SET(COMMON_SOURCES -CylinderPluginInfo.C -CylinderCommonPluginInfo.C -CylinderAttributes.C -) - -SET(LIBI_SOURCES -CylinderPluginInfo.C -) - -SET(LIBG_SOURCES -CylinderGUIPluginInfo.C -QvisCylinderWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -CylinderViewerEnginePluginInfo.C -CylinderViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -CylinderViewerEnginePluginInfo.C -CylinderEnginePluginInfo.C -avtCylinderFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(ICylinderOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(ICylinderOperator visitcommon) -SET(INSTALLTARGETS ICylinderOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GCylinderOperator ${LIBG_SOURCES}) - set_target_properties(GCylinderOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GCylinderOperator visitcommon gui ) - - ADD_LIBRARY(VCylinderOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VCylinderOperator VIEWER) - TARGET_LINK_LIBRARIES(VCylinderOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GCylinderOperator VCylinderOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - CylinderScriptingPluginInfo.C - PyCylinderAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SCylinderOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SCylinderOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SCylinderOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY CylinderAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaCylinder ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} CylinderAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(ECylinderOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(ECylinderOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} ECylinderOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(ECylinderOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(ECylinderOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} ECylinderOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators Cylinder ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME Cylinder + DEFINES ${Cylinder_DEFINES}) diff --git a/src/operators/DataBinning/CMakeLists.txt b/src/operators/DataBinning/CMakeLists.txt index c623c5b82ae..a8b1d196c09 100644 --- a/src/operators/DataBinning/CMakeLists.txt +++ b/src/operators/DataBinning/CMakeLists.txt @@ -1,91 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(DataBinning_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(DataBinning) - -SET(COMMON_SOURCES -DataBinningPluginInfo.C -DataBinningCommonPluginInfo.C -DataBinningAttributes.C -) - -SET(LIBI_SOURCES -DataBinningPluginInfo.C -) - -SET(LIBG_SOURCES -DataBinningGUIPluginInfo.C -QvisDataBinningWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -DataBinningViewerEnginePluginInfo.C -DataBinningViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -DataBinningViewerEnginePluginInfo.C -DataBinningEnginePluginInfo.C -avtDataBinningFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -${VISIT_INCLUDE_DIR}/avt/DataBinning -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IDataBinningOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IDataBinningOperator visitcommon) -SET(INSTALLTARGETS IDataBinningOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GDataBinningOperator ${LIBG_SOURCES}) - set_target_properties(GDataBinningOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GDataBinningOperator visitcommon gui ) - - ADD_LIBRARY(VDataBinningOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VDataBinningOperator VIEWER) - TARGET_LINK_LIBRARIES(VDataBinningOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GDataBinningOperator VDataBinningOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - DataBinningScriptingPluginInfo.C - PyDataBinningAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SDataBinningOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SDataBinningOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SDataBinningOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY DataBinningAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaDataBinning ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} DataBinningAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EDataBinningOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EDataBinningOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EDataBinningOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EDataBinningOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EDataBinningOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EDataBinningOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators DataBinning ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME DataBinning + DEFINES ${DataBinning_DEFINES}) diff --git a/src/operators/DataBinning/DataBinning.xml b/src/operators/DataBinning/DataBinning.xml index dc455739ca1..6ecfe1a983c 100644 --- a/src/operators/DataBinning/DataBinning.xml +++ b/src/operators/DataBinning/DataBinning.xml @@ -1,8 +1,5 @@ - - ${VISIT_INCLUDE_DIR}/avt/DataBinning - Average diff --git a/src/operators/Decimate/CMakeLists.txt b/src/operators/Decimate/CMakeLists.txt index b5d41a641e0..503bc95b134 100644 --- a/src/operators/Decimate/CMakeLists.txt +++ b/src/operators/Decimate/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(Decimate_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(Decimate) - -SET(COMMON_SOURCES -DecimatePluginInfo.C -DecimateCommonPluginInfo.C -DecimateAttributes.C -) - -SET(LIBI_SOURCES -DecimatePluginInfo.C -) - -SET(LIBG_SOURCES -DecimateGUIPluginInfo.C -QvisDecimateWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -DecimateViewerEnginePluginInfo.C -DecimateViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -DecimateViewerEnginePluginInfo.C -DecimateEnginePluginInfo.C -avtDecimateFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IDecimateOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IDecimateOperator visitcommon) -SET(INSTALLTARGETS IDecimateOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GDecimateOperator ${LIBG_SOURCES}) - set_target_properties(GDecimateOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GDecimateOperator visitcommon gui ) - - ADD_LIBRARY(VDecimateOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VDecimateOperator VIEWER) - TARGET_LINK_LIBRARIES(VDecimateOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GDecimateOperator VDecimateOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - DecimateScriptingPluginInfo.C - PyDecimateAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SDecimateOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SDecimateOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SDecimateOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY DecimateAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaDecimate ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} DecimateAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EDecimateOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EDecimateOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EDecimateOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EDecimateOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EDecimateOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EDecimateOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators Decimate ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME Decimate + DEFINES ${Decimate_DEFINES}) diff --git a/src/operators/DeferExpression/CMakeLists.txt b/src/operators/DeferExpression/CMakeLists.txt index d5299143022..fa789113d67 100644 --- a/src/operators/DeferExpression/CMakeLists.txt +++ b/src/operators/DeferExpression/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(DeferExpression_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(DeferExpression) - -SET(COMMON_SOURCES -DeferExpressionPluginInfo.C -DeferExpressionCommonPluginInfo.C -DeferExpressionAttributes.C -) - -SET(LIBI_SOURCES -DeferExpressionPluginInfo.C -) - -SET(LIBG_SOURCES -DeferExpressionGUIPluginInfo.C -QvisDeferExpressionWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -DeferExpressionViewerEnginePluginInfo.C -DeferExpressionViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -DeferExpressionViewerEnginePluginInfo.C -DeferExpressionEnginePluginInfo.C -avtDeferExpressionFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IDeferExpressionOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IDeferExpressionOperator visitcommon) -SET(INSTALLTARGETS IDeferExpressionOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GDeferExpressionOperator ${LIBG_SOURCES}) - set_target_properties(GDeferExpressionOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GDeferExpressionOperator visitcommon gui ) - - ADD_LIBRARY(VDeferExpressionOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VDeferExpressionOperator VIEWER) - TARGET_LINK_LIBRARIES(VDeferExpressionOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GDeferExpressionOperator VDeferExpressionOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - DeferExpressionScriptingPluginInfo.C - PyDeferExpressionAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SDeferExpressionOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SDeferExpressionOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SDeferExpressionOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY DeferExpressionAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaDeferExpression ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} DeferExpressionAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EDeferExpressionOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EDeferExpressionOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EDeferExpressionOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EDeferExpressionOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EDeferExpressionOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EDeferExpressionOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators DeferExpression ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME DeferExpression + DEFINES ${DeferExpression_DEFINES}) diff --git a/src/operators/Delaunay/CMakeLists.txt b/src/operators/Delaunay/CMakeLists.txt index 266a4bf6ab1..8fdf24d6b1a 100644 --- a/src/operators/Delaunay/CMakeLists.txt +++ b/src/operators/Delaunay/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(Delaunay_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(Delaunay) - -SET(COMMON_SOURCES -DelaunayPluginInfo.C -DelaunayCommonPluginInfo.C -DelaunayAttributes.C -) - -SET(LIBI_SOURCES -DelaunayPluginInfo.C -) - -SET(LIBG_SOURCES -DelaunayGUIPluginInfo.C -QvisDelaunayWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -DelaunayViewerEnginePluginInfo.C -DelaunayViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -DelaunayViewerEnginePluginInfo.C -DelaunayEnginePluginInfo.C -avtDelaunayFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IDelaunayOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IDelaunayOperator visitcommon) -SET(INSTALLTARGETS IDelaunayOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GDelaunayOperator ${LIBG_SOURCES}) - set_target_properties(GDelaunayOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GDelaunayOperator visitcommon gui ) - - ADD_LIBRARY(VDelaunayOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VDelaunayOperator VIEWER) - TARGET_LINK_LIBRARIES(VDelaunayOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GDelaunayOperator VDelaunayOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - DelaunayScriptingPluginInfo.C - PyDelaunayAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SDelaunayOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SDelaunayOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SDelaunayOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY DelaunayAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaDelaunay ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} DelaunayAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EDelaunayOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EDelaunayOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EDelaunayOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EDelaunayOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EDelaunayOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EDelaunayOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators Delaunay ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME Delaunay + DEFINES ${Delaunay_DEFINES}) diff --git a/src/operators/Displace/CMakeLists.txt b/src/operators/Displace/CMakeLists.txt index 4bc4320b194..e4c444b37d6 100644 --- a/src/operators/Displace/CMakeLists.txt +++ b/src/operators/Displace/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(Displace_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(Displace) - -SET(COMMON_SOURCES -DisplacePluginInfo.C -DisplaceCommonPluginInfo.C -DisplaceAttributes.C -) - -SET(LIBI_SOURCES -DisplacePluginInfo.C -) - -SET(LIBG_SOURCES -DisplaceGUIPluginInfo.C -QvisDisplaceWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -DisplaceViewerEnginePluginInfo.C -DisplaceViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -DisplaceViewerEnginePluginInfo.C -DisplaceEnginePluginInfo.C -avtDisplacePluginFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IDisplaceOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IDisplaceOperator visitcommon) -SET(INSTALLTARGETS IDisplaceOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GDisplaceOperator ${LIBG_SOURCES}) - set_target_properties(GDisplaceOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GDisplaceOperator visitcommon gui ) - - ADD_LIBRARY(VDisplaceOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VDisplaceOperator VIEWER) - TARGET_LINK_LIBRARIES(VDisplaceOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GDisplaceOperator VDisplaceOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - DisplaceScriptingPluginInfo.C - PyDisplaceAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SDisplaceOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SDisplaceOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SDisplaceOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY DisplaceAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaDisplace ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} DisplaceAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EDisplaceOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EDisplaceOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EDisplaceOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EDisplaceOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EDisplaceOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EDisplaceOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators Displace ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME Displace + DEFINES ${Displace_DEFINES}) diff --git a/src/operators/Displace/Displace.xml b/src/operators/Displace/Displace.xml index 105f78c05d5..249c29a0aa2 100644 --- a/src/operators/Displace/Displace.xml +++ b/src/operators/Displace/Displace.xml @@ -1,8 +1,5 @@ - - avtDisplacePluginFilter.C - 1.000000 diff --git a/src/operators/DualMesh/CMakeLists.txt b/src/operators/DualMesh/CMakeLists.txt index 0aaf0ae9838..e1043c720b2 100644 --- a/src/operators/DualMesh/CMakeLists.txt +++ b/src/operators/DualMesh/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(DualMesh_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(DualMesh) - -SET(COMMON_SOURCES -DualMeshPluginInfo.C -DualMeshCommonPluginInfo.C -DualMeshAttributes.C -) - -SET(LIBI_SOURCES -DualMeshPluginInfo.C -) - -SET(LIBG_SOURCES -DualMeshGUIPluginInfo.C -QvisDualMeshWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -DualMeshViewerEnginePluginInfo.C -DualMeshViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -DualMeshViewerEnginePluginInfo.C -DualMeshEnginePluginInfo.C -avtDualMeshFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IDualMeshOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IDualMeshOperator visitcommon) -SET(INSTALLTARGETS IDualMeshOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GDualMeshOperator ${LIBG_SOURCES}) - set_target_properties(GDualMeshOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GDualMeshOperator visitcommon gui ) - - ADD_LIBRARY(VDualMeshOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VDualMeshOperator VIEWER) - TARGET_LINK_LIBRARIES(VDualMeshOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GDualMeshOperator VDualMeshOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - DualMeshScriptingPluginInfo.C - PyDualMeshAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SDualMeshOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SDualMeshOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SDualMeshOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY DualMeshAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaDualMesh ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} DualMeshAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EDualMeshOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EDualMeshOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EDualMeshOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EDualMeshOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EDualMeshOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EDualMeshOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators DualMesh ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME DualMesh + DEFINES ${DualMesh_DEFINES}) diff --git a/src/operators/Edge/CMakeLists.txt b/src/operators/Edge/CMakeLists.txt index ab09fa44860..b5c1ea37fad 100644 --- a/src/operators/Edge/CMakeLists.txt +++ b/src/operators/Edge/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(Edge_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(Edge) - -SET(COMMON_SOURCES -EdgePluginInfo.C -EdgeCommonPluginInfo.C -EdgeAttributes.C -) - -SET(LIBI_SOURCES -EdgePluginInfo.C -) - -SET(LIBG_SOURCES -EdgeGUIPluginInfo.C -QvisEdgeWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -EdgeViewerEnginePluginInfo.C -EdgeViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -EdgeViewerEnginePluginInfo.C -EdgeEnginePluginInfo.C -avtEdgeFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IEdgeOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IEdgeOperator visitcommon) -SET(INSTALLTARGETS IEdgeOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GEdgeOperator ${LIBG_SOURCES}) - set_target_properties(GEdgeOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GEdgeOperator visitcommon gui ) - - ADD_LIBRARY(VEdgeOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VEdgeOperator VIEWER) - TARGET_LINK_LIBRARIES(VEdgeOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GEdgeOperator VEdgeOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - EdgeScriptingPluginInfo.C - PyEdgeAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SEdgeOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SEdgeOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SEdgeOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY EdgeAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaEdge ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} EdgeAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EEdgeOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EEdgeOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EEdgeOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EEdgeOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EEdgeOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EEdgeOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators Edge ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME Edge + DEFINES ${Edge_DEFINES}) diff --git a/src/operators/Elevate/CMakeLists.txt b/src/operators/Elevate/CMakeLists.txt index 69c9904237c..06a1e0f53e1 100644 --- a/src/operators/Elevate/CMakeLists.txt +++ b/src/operators/Elevate/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(Elevate_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(Elevate) - -SET(COMMON_SOURCES -ElevatePluginInfo.C -ElevateCommonPluginInfo.C -ElevateAttributes.C -) - -SET(LIBI_SOURCES -ElevatePluginInfo.C -) - -SET(LIBG_SOURCES -ElevateGUIPluginInfo.C -QvisElevateWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -ElevateViewerEnginePluginInfo.C -ElevateViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -ElevateViewerEnginePluginInfo.C -ElevateEnginePluginInfo.C -avtElevateFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IElevateOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IElevateOperator visitcommon) -SET(INSTALLTARGETS IElevateOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GElevateOperator ${LIBG_SOURCES}) - set_target_properties(GElevateOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GElevateOperator visitcommon gui ) - - ADD_LIBRARY(VElevateOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VElevateOperator VIEWER) - TARGET_LINK_LIBRARIES(VElevateOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GElevateOperator VElevateOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - ElevateScriptingPluginInfo.C - PyElevateAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SElevateOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SElevateOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SElevateOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY ElevateAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaElevate ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} ElevateAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EElevateOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EElevateOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EElevateOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EElevateOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EElevateOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EElevateOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators Elevate ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME Elevate + DEFINES ${Elevate_DEFINES}) diff --git a/src/operators/EllipsoidSlice/CMakeLists.txt b/src/operators/EllipsoidSlice/CMakeLists.txt index 205c224a0ef..70955d620c4 100644 --- a/src/operators/EllipsoidSlice/CMakeLists.txt +++ b/src/operators/EllipsoidSlice/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(EllipsoidSlice_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(EllipsoidSlice) - -SET(COMMON_SOURCES -EllipsoidSlicePluginInfo.C -EllipsoidSliceCommonPluginInfo.C -EllipsoidSliceAttributes.C -) - -SET(LIBI_SOURCES -EllipsoidSlicePluginInfo.C -) - -SET(LIBG_SOURCES -EllipsoidSliceGUIPluginInfo.C -QvisEllipsoidSliceWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -EllipsoidSliceViewerEnginePluginInfo.C -EllipsoidSliceViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -EllipsoidSliceViewerEnginePluginInfo.C -EllipsoidSliceEnginePluginInfo.C -avtEllipsoidSliceFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IEllipsoidSliceOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IEllipsoidSliceOperator visitcommon) -SET(INSTALLTARGETS IEllipsoidSliceOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GEllipsoidSliceOperator ${LIBG_SOURCES}) - set_target_properties(GEllipsoidSliceOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GEllipsoidSliceOperator visitcommon gui ) - - ADD_LIBRARY(VEllipsoidSliceOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VEllipsoidSliceOperator VIEWER) - TARGET_LINK_LIBRARIES(VEllipsoidSliceOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GEllipsoidSliceOperator VEllipsoidSliceOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - EllipsoidSliceScriptingPluginInfo.C - PyEllipsoidSliceAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SEllipsoidSliceOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SEllipsoidSliceOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SEllipsoidSliceOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY EllipsoidSliceAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaEllipsoidSlice ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} EllipsoidSliceAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EEllipsoidSliceOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EEllipsoidSliceOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EEllipsoidSliceOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EEllipsoidSliceOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EEllipsoidSliceOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EEllipsoidSliceOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators EllipsoidSlice ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME EllipsoidSlice + DEFINES ${EllipsoidSlice_DEFINES}) diff --git a/src/operators/Explode/CMakeLists.txt b/src/operators/Explode/CMakeLists.txt index 98cb3049fe7..58c98bc4070 100644 --- a/src/operators/Explode/CMakeLists.txt +++ b/src/operators/Explode/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(Explode_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(Explode) - -SET(COMMON_SOURCES -ExplodePluginInfo.C -ExplodeCommonPluginInfo.C -ExplodeAttributes.C -) - -SET(LIBI_SOURCES -ExplodePluginInfo.C -) - -SET(LIBG_SOURCES -ExplodeGUIPluginInfo.C -QvisExplodeWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -ExplodeViewerEnginePluginInfo.C -ExplodeViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -ExplodeViewerEnginePluginInfo.C -ExplodeEnginePluginInfo.C -avtExplodeFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IExplodeOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IExplodeOperator visitcommon) -SET(INSTALLTARGETS IExplodeOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GExplodeOperator ${LIBG_SOURCES}) - set_target_properties(GExplodeOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GExplodeOperator visitcommon gui ) - - ADD_LIBRARY(VExplodeOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VExplodeOperator VIEWER) - TARGET_LINK_LIBRARIES(VExplodeOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GExplodeOperator VExplodeOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - ExplodeScriptingPluginInfo.C - PyExplodeAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SExplodeOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SExplodeOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SExplodeOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY ExplodeAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaExplode ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} ExplodeAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EExplodeOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EExplodeOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EExplodeOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EExplodeOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EExplodeOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EExplodeOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators Explode ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME Explode + DEFINES ${Explode_DEFINES}) diff --git a/src/operators/ExternalSurface/CMakeLists.txt b/src/operators/ExternalSurface/CMakeLists.txt index ae3ae295425..095451cc731 100644 --- a/src/operators/ExternalSurface/CMakeLists.txt +++ b/src/operators/ExternalSurface/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(ExternalSurface_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(ExternalSurface) - -SET(COMMON_SOURCES -ExternalSurfacePluginInfo.C -ExternalSurfaceCommonPluginInfo.C -ExternalSurfaceAttributes.C -) - -SET(LIBI_SOURCES -ExternalSurfacePluginInfo.C -) - -SET(LIBG_SOURCES -ExternalSurfaceGUIPluginInfo.C -QvisExternalSurfaceWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -ExternalSurfaceViewerEnginePluginInfo.C -ExternalSurfaceViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -ExternalSurfaceViewerEnginePluginInfo.C -ExternalSurfaceEnginePluginInfo.C -avtExternalSurfaceFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IExternalSurfaceOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IExternalSurfaceOperator visitcommon) -SET(INSTALLTARGETS IExternalSurfaceOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GExternalSurfaceOperator ${LIBG_SOURCES}) - set_target_properties(GExternalSurfaceOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GExternalSurfaceOperator visitcommon gui ) - - ADD_LIBRARY(VExternalSurfaceOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VExternalSurfaceOperator VIEWER) - TARGET_LINK_LIBRARIES(VExternalSurfaceOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GExternalSurfaceOperator VExternalSurfaceOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - ExternalSurfaceScriptingPluginInfo.C - PyExternalSurfaceAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SExternalSurfaceOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SExternalSurfaceOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SExternalSurfaceOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY ExternalSurfaceAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaExternalSurface ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} ExternalSurfaceAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EExternalSurfaceOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EExternalSurfaceOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EExternalSurfaceOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EExternalSurfaceOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EExternalSurfaceOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EExternalSurfaceOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators ExternalSurface ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME ExternalSurface + DEFINES ${ExternalSurface_DEFINES}) diff --git a/src/operators/ExtractPointFunction2D/CMakeLists.txt b/src/operators/ExtractPointFunction2D/CMakeLists.txt index e68232c8ffa..505561dd27b 100644 --- a/src/operators/ExtractPointFunction2D/CMakeLists.txt +++ b/src/operators/ExtractPointFunction2D/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(ExtractPointFunction2D_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(ExtractPointFunction2D) - -SET(COMMON_SOURCES -ExtractPointFunction2DPluginInfo.C -ExtractPointFunction2DCommonPluginInfo.C -ExtractPointFunction2DAttributes.C -) - -SET(LIBI_SOURCES -ExtractPointFunction2DPluginInfo.C -) - -SET(LIBG_SOURCES -ExtractPointFunction2DGUIPluginInfo.C -QvisExtractPointFunction2DWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -ExtractPointFunction2DViewerEnginePluginInfo.C -ExtractPointFunction2DViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -ExtractPointFunction2DViewerEnginePluginInfo.C -ExtractPointFunction2DEnginePluginInfo.C -avtExtractPointFunction2DFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IExtractPointFunction2DOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IExtractPointFunction2DOperator visitcommon) -SET(INSTALLTARGETS IExtractPointFunction2DOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GExtractPointFunction2DOperator ${LIBG_SOURCES}) - set_target_properties(GExtractPointFunction2DOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GExtractPointFunction2DOperator visitcommon gui ) - - ADD_LIBRARY(VExtractPointFunction2DOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VExtractPointFunction2DOperator VIEWER) - TARGET_LINK_LIBRARIES(VExtractPointFunction2DOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GExtractPointFunction2DOperator VExtractPointFunction2DOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - ExtractPointFunction2DScriptingPluginInfo.C - PyExtractPointFunction2DAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SExtractPointFunction2DOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SExtractPointFunction2DOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SExtractPointFunction2DOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY ExtractPointFunction2DAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaExtractPointFunction2D ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} ExtractPointFunction2DAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EExtractPointFunction2DOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EExtractPointFunction2DOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EExtractPointFunction2DOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EExtractPointFunction2DOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EExtractPointFunction2DOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EExtractPointFunction2DOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators ExtractPointFunction2D ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME ExtractPointFunction2D + DEFINES ${ExtractPointFunction2D_DEFINES}) diff --git a/src/operators/Extrude/CMakeLists.txt b/src/operators/Extrude/CMakeLists.txt index fbe1f61e4bf..9a29689be3d 100644 --- a/src/operators/Extrude/CMakeLists.txt +++ b/src/operators/Extrude/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(Extrude_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(Extrude) - -SET(COMMON_SOURCES -ExtrudePluginInfo.C -ExtrudeCommonPluginInfo.C -ExtrudeAttributes.C -) - -SET(LIBI_SOURCES -ExtrudePluginInfo.C -) - -SET(LIBG_SOURCES -ExtrudeGUIPluginInfo.C -QvisExtrudeWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -ExtrudeViewerEnginePluginInfo.C -ExtrudeViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -ExtrudeViewerEnginePluginInfo.C -ExtrudeEnginePluginInfo.C -avtExtrudeFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IExtrudeOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IExtrudeOperator visitcommon) -SET(INSTALLTARGETS IExtrudeOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GExtrudeOperator ${LIBG_SOURCES}) - set_target_properties(GExtrudeOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GExtrudeOperator visitcommon gui ) - - ADD_LIBRARY(VExtrudeOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VExtrudeOperator VIEWER) - TARGET_LINK_LIBRARIES(VExtrudeOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GExtrudeOperator VExtrudeOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - ExtrudeScriptingPluginInfo.C - PyExtrudeAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SExtrudeOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SExtrudeOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SExtrudeOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY ExtrudeAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaExtrude ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} ExtrudeAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EExtrudeOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EExtrudeOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EExtrudeOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EExtrudeOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EExtrudeOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EExtrudeOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators Extrude ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME Extrude + DEFINES ${Extrude_DEFINES}) diff --git a/src/operators/ExtrudeStacked/CMakeLists.txt b/src/operators/ExtrudeStacked/CMakeLists.txt index b1fb53666f8..e08791fa36a 100644 --- a/src/operators/ExtrudeStacked/CMakeLists.txt +++ b/src/operators/ExtrudeStacked/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(ExtrudeStacked_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(ExtrudeStacked) - -SET(COMMON_SOURCES -ExtrudeStackedPluginInfo.C -ExtrudeStackedCommonPluginInfo.C -ExtrudeStackedAttributes.C -) - -SET(LIBI_SOURCES -ExtrudeStackedPluginInfo.C -) - -SET(LIBG_SOURCES -ExtrudeStackedGUIPluginInfo.C -QvisExtrudeStackedWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -ExtrudeStackedViewerEnginePluginInfo.C -ExtrudeStackedViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -ExtrudeStackedViewerEnginePluginInfo.C -ExtrudeStackedEnginePluginInfo.C -avtExtrudeStackedFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IExtrudeStackedOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IExtrudeStackedOperator visitcommon) -SET(INSTALLTARGETS IExtrudeStackedOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GExtrudeStackedOperator ${LIBG_SOURCES}) - set_target_properties(GExtrudeStackedOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GExtrudeStackedOperator visitcommon gui ) - - ADD_LIBRARY(VExtrudeStackedOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VExtrudeStackedOperator VIEWER) - TARGET_LINK_LIBRARIES(VExtrudeStackedOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GExtrudeStackedOperator VExtrudeStackedOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - ExtrudeStackedScriptingPluginInfo.C - PyExtrudeStackedAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SExtrudeStackedOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SExtrudeStackedOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SExtrudeStackedOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY ExtrudeStackedAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaExtrudeStacked ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} ExtrudeStackedAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EExtrudeStackedOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EExtrudeStackedOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EExtrudeStackedOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EExtrudeStackedOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EExtrudeStackedOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EExtrudeStackedOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators ExtrudeStacked ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME ExtrudeStacked + DEFINES ${ExtrudeStacked_DEFINES}) diff --git a/src/operators/FFT/CMakeLists.txt b/src/operators/FFT/CMakeLists.txt index a3fe053d297..c07c73acb34 100644 --- a/src/operators/FFT/CMakeLists.txt +++ b/src/operators/FFT/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(FFT_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(FFT) - -SET(COMMON_SOURCES -FFTPluginInfo.C -FFTCommonPluginInfo.C -FFTAttributes.C -) - -SET(LIBI_SOURCES -FFTPluginInfo.C -) - -SET(LIBG_SOURCES -FFTGUIPluginInfo.C -QvisFFTWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -FFTViewerEnginePluginInfo.C -FFTViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -FFTViewerEnginePluginInfo.C -FFTEnginePluginInfo.C -avtFFTFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IFFTOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IFFTOperator visitcommon) -SET(INSTALLTARGETS IFFTOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GFFTOperator ${LIBG_SOURCES}) - set_target_properties(GFFTOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GFFTOperator visitcommon gui ) - - ADD_LIBRARY(VFFTOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VFFTOperator VIEWER) - TARGET_LINK_LIBRARIES(VFFTOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GFFTOperator VFFTOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - FFTScriptingPluginInfo.C - PyFFTAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SFFTOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SFFTOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SFFTOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY FFTAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaFFT ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} FFTAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EFFTOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EFFTOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EFFTOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EFFTOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EFFTOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EFFTOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators FFT ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME FFT + DEFINES ${FFT_DEFINES}) diff --git a/src/operators/FiveFoldTetSubdivision/CMakeLists.txt b/src/operators/FiveFoldTetSubdivision/CMakeLists.txt index 5591bda2ad0..e1754effc64 100644 --- a/src/operators/FiveFoldTetSubdivision/CMakeLists.txt +++ b/src/operators/FiveFoldTetSubdivision/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(FiveFoldTetSubdivision_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(FiveFoldTetSubdivision) - -SET(COMMON_SOURCES -FiveFoldTetSubdivisionPluginInfo.C -FiveFoldTetSubdivisionCommonPluginInfo.C -FiveFoldTetSubdivisionAttributes.C -) - -SET(LIBI_SOURCES -FiveFoldTetSubdivisionPluginInfo.C -) - -SET(LIBG_SOURCES -FiveFoldTetSubdivisionGUIPluginInfo.C -QvisFiveFoldTetSubdivisionWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -FiveFoldTetSubdivisionViewerEnginePluginInfo.C -FiveFoldTetSubdivisionViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -FiveFoldTetSubdivisionViewerEnginePluginInfo.C -FiveFoldTetSubdivisionEnginePluginInfo.C -avtFiveFoldTetSubdivisionFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IFiveFoldTetSubdivisionOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IFiveFoldTetSubdivisionOperator visitcommon) -SET(INSTALLTARGETS IFiveFoldTetSubdivisionOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GFiveFoldTetSubdivisionOperator ${LIBG_SOURCES}) - set_target_properties(GFiveFoldTetSubdivisionOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GFiveFoldTetSubdivisionOperator visitcommon gui ) - - ADD_LIBRARY(VFiveFoldTetSubdivisionOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VFiveFoldTetSubdivisionOperator VIEWER) - TARGET_LINK_LIBRARIES(VFiveFoldTetSubdivisionOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GFiveFoldTetSubdivisionOperator VFiveFoldTetSubdivisionOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - FiveFoldTetSubdivisionScriptingPluginInfo.C - PyFiveFoldTetSubdivisionAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SFiveFoldTetSubdivisionOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SFiveFoldTetSubdivisionOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SFiveFoldTetSubdivisionOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY FiveFoldTetSubdivisionAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaFiveFoldTetSubdivision ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} FiveFoldTetSubdivisionAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EFiveFoldTetSubdivisionOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EFiveFoldTetSubdivisionOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EFiveFoldTetSubdivisionOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EFiveFoldTetSubdivisionOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EFiveFoldTetSubdivisionOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EFiveFoldTetSubdivisionOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators FiveFoldTetSubdivision ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME FiveFoldTetSubdivision + DEFINES ${FiveFoldTetSubdivision_DEFINES}) diff --git a/src/operators/Flux/CMakeLists.txt b/src/operators/Flux/CMakeLists.txt index 6aebd3ffe3d..2b9d0ff633b 100644 --- a/src/operators/Flux/CMakeLists.txt +++ b/src/operators/Flux/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(Flux_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(Flux) - -SET(COMMON_SOURCES -FluxPluginInfo.C -FluxCommonPluginInfo.C -FluxAttributes.C -) - -SET(LIBI_SOURCES -FluxPluginInfo.C -) - -SET(LIBG_SOURCES -FluxGUIPluginInfo.C -QvisFluxWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -FluxViewerEnginePluginInfo.C -FluxViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -FluxViewerEnginePluginInfo.C -FluxEnginePluginInfo.C -avtFluxFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IFluxOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IFluxOperator visitcommon) -SET(INSTALLTARGETS IFluxOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GFluxOperator ${LIBG_SOURCES}) - set_target_properties(GFluxOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GFluxOperator visitcommon gui ) - - ADD_LIBRARY(VFluxOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VFluxOperator VIEWER) - TARGET_LINK_LIBRARIES(VFluxOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GFluxOperator VFluxOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - FluxScriptingPluginInfo.C - PyFluxAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SFluxOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SFluxOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SFluxOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY FluxAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaFlux ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} FluxAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EFluxOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EFluxOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EFluxOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EFluxOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EFluxOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EFluxOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators Flux ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME Flux + DEFINES ${Flux_DEFINES}) diff --git a/src/operators/IndexSelect/CMakeLists.txt b/src/operators/IndexSelect/CMakeLists.txt index f5b0609fd3a..4e064080464 100644 --- a/src/operators/IndexSelect/CMakeLists.txt +++ b/src/operators/IndexSelect/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(IndexSelect_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(IndexSelect) - -SET(COMMON_SOURCES -IndexSelectPluginInfo.C -IndexSelectCommonPluginInfo.C -IndexSelectAttributes.C -) - -SET(LIBI_SOURCES -IndexSelectPluginInfo.C -) - -SET(LIBG_SOURCES -IndexSelectGUIPluginInfo.C -QvisIndexSelectWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -IndexSelectViewerEnginePluginInfo.C -IndexSelectViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -IndexSelectViewerEnginePluginInfo.C -IndexSelectEnginePluginInfo.C -avtIndexSelectFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IIndexSelectOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IIndexSelectOperator visitcommon) -SET(INSTALLTARGETS IIndexSelectOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GIndexSelectOperator ${LIBG_SOURCES}) - set_target_properties(GIndexSelectOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GIndexSelectOperator visitcommon gui ) - - ADD_LIBRARY(VIndexSelectOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VIndexSelectOperator VIEWER) - TARGET_LINK_LIBRARIES(VIndexSelectOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GIndexSelectOperator VIndexSelectOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - IndexSelectScriptingPluginInfo.C - PyIndexSelectAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SIndexSelectOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SIndexSelectOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SIndexSelectOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY IndexSelectAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaIndexSelect ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} IndexSelectAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EIndexSelectOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EIndexSelectOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EIndexSelectOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EIndexSelectOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EIndexSelectOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EIndexSelectOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators IndexSelect ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME IndexSelect + DEFINES ${IndexSelect_DEFINES}) diff --git a/src/operators/IntegralCurve/CMakeLists.txt b/src/operators/IntegralCurve/CMakeLists.txt index 572341cc348..667f94e37b3 100644 --- a/src/operators/IntegralCurve/CMakeLists.txt +++ b/src/operators/IntegralCurve/CMakeLists.txt @@ -1,90 +1,7 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(IntegralCurve_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(IntegralCurve) - -SET(COMMON_SOURCES -IntegralCurvePluginInfo.C -IntegralCurveCommonPluginInfo.C -IntegralCurveAttributes.C -) - -SET(LIBI_SOURCES -IntegralCurvePluginInfo.C -) - -SET(LIBG_SOURCES -IntegralCurveGUIPluginInfo.C -QvisIntegralCurveWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -IntegralCurveViewerEnginePluginInfo.C -IntegralCurveViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -IntegralCurveViewerEnginePluginInfo.C -IntegralCurveEnginePluginInfo.C -avtIntegralCurveFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${NEKTAR++_LIBRARY_DIR} ${NEKTAR++_LIBRARY_DIRS} ${NEKTAR++_TP_LIBRARY_DIRS} ${ACCELERATE_FRAMEWORK_LINK_FLAGS} ) - -ADD_LIBRARY(IIntegralCurveOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IIntegralCurveOperator visitcommon) -SET(INSTALLTARGETS IIntegralCurveOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GIntegralCurveOperator ${LIBG_SOURCES}) - set_target_properties(GIntegralCurveOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GIntegralCurveOperator visitcommon gui ) - - ADD_LIBRARY(VIntegralCurveOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VIntegralCurveOperator VIEWER) - TARGET_LINK_LIBRARIES(VIntegralCurveOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GIntegralCurveOperator VIntegralCurveOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - IntegralCurveScriptingPluginInfo.C - PyIntegralCurveAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SIntegralCurveOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SIntegralCurveOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SIntegralCurveOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY IntegralCurveAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaIntegralCurve ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} IntegralCurveAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EIntegralCurveOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EIntegralCurveOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser avtivp_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EIntegralCurveOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EIntegralCurveOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EIntegralCurveOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par avtivp_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EIntegralCurveOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators IntegralCurve ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME IntegralCurve + DEFINES ${IntegralCurve_DEFINES} + ESERLIBS avtivp_ser + EPARLIBS avtivp_par) diff --git a/src/operators/IntegralCurve/IntegralCurve.xml b/src/operators/IntegralCurve/IntegralCurve.xml index ec5b8ceba92..5b2779300c1 100644 --- a/src/operators/IntegralCurve/IntegralCurve.xml +++ b/src/operators/IntegralCurve/IntegralCurve.xml @@ -12,17 +12,6 @@ avtivp_par - - - - avtIntegralCurveFilter.C - - - avtivp_ser - - - avtivp_par - SpecifiedPoint diff --git a/src/operators/InverseGhostZone/CMakeLists.txt b/src/operators/InverseGhostZone/CMakeLists.txt index b0892d96247..36c235497db 100644 --- a/src/operators/InverseGhostZone/CMakeLists.txt +++ b/src/operators/InverseGhostZone/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(InverseGhostZone_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(InverseGhostZone) - -SET(COMMON_SOURCES -InverseGhostZonePluginInfo.C -InverseGhostZoneCommonPluginInfo.C -InverseGhostZoneAttributes.C -) - -SET(LIBI_SOURCES -InverseGhostZonePluginInfo.C -) - -SET(LIBG_SOURCES -InverseGhostZoneGUIPluginInfo.C -QvisInverseGhostZoneWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -InverseGhostZoneViewerEnginePluginInfo.C -InverseGhostZoneViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -InverseGhostZoneViewerEnginePluginInfo.C -InverseGhostZoneEnginePluginInfo.C -avtInverseGhostZoneFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IInverseGhostZoneOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IInverseGhostZoneOperator visitcommon) -SET(INSTALLTARGETS IInverseGhostZoneOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GInverseGhostZoneOperator ${LIBG_SOURCES}) - set_target_properties(GInverseGhostZoneOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GInverseGhostZoneOperator visitcommon gui ) - - ADD_LIBRARY(VInverseGhostZoneOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VInverseGhostZoneOperator VIEWER) - TARGET_LINK_LIBRARIES(VInverseGhostZoneOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GInverseGhostZoneOperator VInverseGhostZoneOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - InverseGhostZoneScriptingPluginInfo.C - PyInverseGhostZoneAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SInverseGhostZoneOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SInverseGhostZoneOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SInverseGhostZoneOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY InverseGhostZoneAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaInverseGhostZone ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} InverseGhostZoneAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EInverseGhostZoneOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EInverseGhostZoneOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EInverseGhostZoneOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EInverseGhostZoneOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EInverseGhostZoneOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EInverseGhostZoneOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators InverseGhostZone ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME InverseGhostZone + DEFINES ${InverseGhostZone_DEFINES}) diff --git a/src/operators/Isosurface/CMakeLists.txt b/src/operators/Isosurface/CMakeLists.txt index 5bac1057b15..60b6d04b3a8 100644 --- a/src/operators/Isosurface/CMakeLists.txt +++ b/src/operators/Isosurface/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(Isosurface_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(Isosurface) - -SET(COMMON_SOURCES -IsosurfacePluginInfo.C -IsosurfaceCommonPluginInfo.C -IsosurfaceAttributes.C -) - -SET(LIBI_SOURCES -IsosurfacePluginInfo.C -) - -SET(LIBG_SOURCES -IsosurfaceGUIPluginInfo.C -QvisIsosurfaceWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -IsosurfaceViewerEnginePluginInfo.C -IsosurfaceViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -IsosurfaceViewerEnginePluginInfo.C -IsosurfaceEnginePluginInfo.C -avtIsosurfaceFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IIsosurfaceOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IIsosurfaceOperator visitcommon) -SET(INSTALLTARGETS IIsosurfaceOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GIsosurfaceOperator ${LIBG_SOURCES}) - set_target_properties(GIsosurfaceOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GIsosurfaceOperator visitcommon gui ) - - ADD_LIBRARY(VIsosurfaceOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VIsosurfaceOperator VIEWER) - TARGET_LINK_LIBRARIES(VIsosurfaceOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GIsosurfaceOperator VIsosurfaceOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - IsosurfaceScriptingPluginInfo.C - PyIsosurfaceAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SIsosurfaceOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SIsosurfaceOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SIsosurfaceOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY IsosurfaceAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaIsosurface ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} IsosurfaceAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EIsosurfaceOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EIsosurfaceOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EIsosurfaceOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EIsosurfaceOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EIsosurfaceOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EIsosurfaceOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators Isosurface ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME Isosurface + DEFINES ${Isosurface_DEFINES}) diff --git a/src/operators/Isovolume/CMakeLists.txt b/src/operators/Isovolume/CMakeLists.txt index 2cb385b5e6c..3f6af8f3ba4 100644 --- a/src/operators/Isovolume/CMakeLists.txt +++ b/src/operators/Isovolume/CMakeLists.txt @@ -1,99 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(Isovolume_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(Isovolume) - -SET(COMMON_SOURCES -IsovolumePluginInfo.C -IsovolumeCommonPluginInfo.C -IsovolumeAttributes.C -) - -SET(LIBI_SOURCES -IsovolumePluginInfo.C -) - -SET(LIBG_SOURCES -IsovolumeGUIPluginInfo.C -QvisIsovolumeWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -IsovolumeViewerEnginePluginInfo.C -IsovolumeViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -IsovolumeViewerEnginePluginInfo.C -IsovolumeEnginePluginInfo.C -avtIsovolumeFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -${VTKm_INCLUDE_DIRS} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IIsovolumeOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IIsovolumeOperator visitcommon) -SET(INSTALLTARGETS IIsovolumeOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GIsovolumeOperator ${LIBG_SOURCES}) - set_target_properties(GIsovolumeOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GIsovolumeOperator visitcommon gui ) - - ADD_LIBRARY(VIsovolumeOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VIsovolumeOperator VIEWER) - TARGET_LINK_LIBRARIES(VIsovolumeOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GIsovolumeOperator VIsovolumeOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - IsovolumeScriptingPluginInfo.C - PyIsovolumeAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SIsovolumeOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SIsovolumeOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SIsovolumeOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY IsovolumeAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaIsovolume ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} IsovolumeAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EIsovolumeOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EIsovolumeOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -if(HAVE_LIBVTKM) - target_link_libraries(EIsovolumeOperator_ser vtkm_cont vtkm_filter_core vtkm_filter_contour vtkm_filter_entity_extraction vtkm_filter_field_conversion vtkm_worklet) -endif() - -SET(INSTALLTARGETS ${INSTALLTARGETS} EIsovolumeOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EIsovolumeOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EIsovolumeOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - if(HAVE_LIBVTKM) - target_link_libraries(EIsovolumeOperator_par vtkm_cont vtkm_filter_core vtkm_filter_contour vtkm_filter_entity_extraction vtkm_filter_field_conversion vtkm_worklet) - endif() - - SET(INSTALLTARGETS ${INSTALLTARGETS} EIsovolumeOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators Isovolume ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME Isovolume + DEFINES ${Isovolume_DEFINES}) diff --git a/src/operators/Isovolume/Isovolume.xml b/src/operators/Isovolume/Isovolume.xml index bcf5be9d867..af42940d691 100644 --- a/src/operators/Isovolume/Isovolume.xml +++ b/src/operators/Isovolume/Isovolume.xml @@ -1,9 +1,6 @@ - - -I${VTKm_INCLUDE_DIRS} - -9999999999999999538762658202121142272.000000 diff --git a/src/operators/Isovolume/avtIsovolumeFilter.C b/src/operators/Isovolume/avtIsovolumeFilter.C index 7679acd62ee..ebb02d428db 100644 --- a/src/operators/Isovolume/avtIsovolumeFilter.C +++ b/src/operators/Isovolume/avtIsovolumeFilter.C @@ -8,6 +8,7 @@ #include +#include // for HAVE_LIBVTKM #ifdef HAVE_LIBVTKM #include #include diff --git a/src/operators/LCS/CMakeLists.txt b/src/operators/LCS/CMakeLists.txt index 5a2d5c74cb5..ad9a1f80640 100644 --- a/src/operators/LCS/CMakeLists.txt +++ b/src/operators/LCS/CMakeLists.txt @@ -1,92 +1,9 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(LCS_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(LCS) - -SET(COMMON_SOURCES -LCSPluginInfo.C -LCSCommonPluginInfo.C -LCSAttributes.C -) - -SET(LIBI_SOURCES -LCSPluginInfo.C -) - -SET(LIBG_SOURCES -LCSGUIPluginInfo.C -QvisLCSWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -LCSViewerEnginePluginInfo.C -LCSViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -LCSViewerEnginePluginInfo.C -LCSEnginePluginInfo.C -avtLCSFilter.C -avtLCSFilterFTLE.C -avtLCSFilterFSLE.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${NEKTAR++_LIBRARY_DIR} ${NEKTAR++_LIBRARY_DIRS} ${NEKTAR++_TP_LIBRARY_DIRS} ${ACCELERATE_FRAMEWORK_LINK_FLAGS} ) - -ADD_LIBRARY(ILCSOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(ILCSOperator visitcommon) -SET(INSTALLTARGETS ILCSOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GLCSOperator ${LIBG_SOURCES}) - set_target_properties(GLCSOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GLCSOperator visitcommon gui ) - - ADD_LIBRARY(VLCSOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VLCSOperator VIEWER) - TARGET_LINK_LIBRARIES(VLCSOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GLCSOperator VLCSOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - LCSScriptingPluginInfo.C - PyLCSAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SLCSOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SLCSOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SLCSOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY LCSAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaLCS ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} LCSAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(ELCSOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(ELCSOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser avtivp_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} ELCSOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(ELCSOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(ELCSOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par avtivp_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} ELCSOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators LCS ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME LCS + ESRC avtLCSFilterFTLE.C + avtLCSFilterFSLE.C + DEFINES ${LCS_DEFINES} + ESERLIBS avtivp_ser + EPARLIBS avtivp_par) diff --git a/src/operators/LCS/LCS.xml b/src/operators/LCS/LCS.xml index d47c8f44cf8..f188bd2209e 100644 --- a/src/operators/LCS/LCS.xml +++ b/src/operators/LCS/LCS.xml @@ -2,7 +2,6 @@ - avtLCSFilter.C avtLCSFilterFTLE.C avtLCSFilterFSLE.C diff --git a/src/operators/Lagrangian/CMakeLists.txt b/src/operators/Lagrangian/CMakeLists.txt index ce7f71a7ac0..a18e51a9540 100644 --- a/src/operators/Lagrangian/CMakeLists.txt +++ b/src/operators/Lagrangian/CMakeLists.txt @@ -1,90 +1,7 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(Lagrangian_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(Lagrangian) - -SET(COMMON_SOURCES -LagrangianPluginInfo.C -LagrangianCommonPluginInfo.C -LagrangianAttributes.C -) - -SET(LIBI_SOURCES -LagrangianPluginInfo.C -) - -SET(LIBG_SOURCES -LagrangianGUIPluginInfo.C -QvisLagrangianWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -LagrangianViewerEnginePluginInfo.C -LagrangianViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -LagrangianViewerEnginePluginInfo.C -LagrangianEnginePluginInfo.C -avtLagrangianFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${NEKTAR++_LIBRARY_DIR} ${NEKTAR++_LIBRARY_DIRS} ${NEKTAR++_TP_LIBRARY_DIRS} ${ACCELERATE_FRAMEWORK_LINK_FLAGS} ) - -ADD_LIBRARY(ILagrangianOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(ILagrangianOperator visitcommon) -SET(INSTALLTARGETS ILagrangianOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GLagrangianOperator ${LIBG_SOURCES}) - set_target_properties(GLagrangianOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GLagrangianOperator visitcommon gui ) - - ADD_LIBRARY(VLagrangianOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VLagrangianOperator VIEWER) - TARGET_LINK_LIBRARIES(VLagrangianOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GLagrangianOperator VLagrangianOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - LagrangianScriptingPluginInfo.C - PyLagrangianAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SLagrangianOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SLagrangianOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SLagrangianOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY LagrangianAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaLagrangian ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} LagrangianAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(ELagrangianOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(ELagrangianOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser avtivp_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} ELagrangianOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(ELagrangianOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(ELagrangianOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par avtivp_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} ELagrangianOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators Lagrangian ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME Lagrangian + DEFINES ${Lagrangian_DEFINES} + ESERLIBS avtivp_ser + EPARLIBS avtivp_par) diff --git a/src/operators/LimitCycle/CMakeLists.txt b/src/operators/LimitCycle/CMakeLists.txt index 89e62f8974f..1e3a529e31f 100644 --- a/src/operators/LimitCycle/CMakeLists.txt +++ b/src/operators/LimitCycle/CMakeLists.txt @@ -1,90 +1,7 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(LimitCycle_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(LimitCycle) - -SET(COMMON_SOURCES -LimitCyclePluginInfo.C -LimitCycleCommonPluginInfo.C -LimitCycleAttributes.C -) - -SET(LIBI_SOURCES -LimitCyclePluginInfo.C -) - -SET(LIBG_SOURCES -LimitCycleGUIPluginInfo.C -QvisLimitCycleWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -LimitCycleViewerEnginePluginInfo.C -LimitCycleViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -LimitCycleViewerEnginePluginInfo.C -LimitCycleEnginePluginInfo.C -avtLimitCycleFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${NEKTAR++_LIBRARY_DIR} ${NEKTAR++_LIBRARY_DIRS} ${NEKTAR++_TP_LIBRARY_DIRS} ${ACCELERATE_FRAMEWORK_LINK_FLAGS} ) - -ADD_LIBRARY(ILimitCycleOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(ILimitCycleOperator visitcommon) -SET(INSTALLTARGETS ILimitCycleOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GLimitCycleOperator ${LIBG_SOURCES}) - set_target_properties(GLimitCycleOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GLimitCycleOperator visitcommon gui ) - - ADD_LIBRARY(VLimitCycleOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VLimitCycleOperator VIEWER) - TARGET_LINK_LIBRARIES(VLimitCycleOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GLimitCycleOperator VLimitCycleOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - LimitCycleScriptingPluginInfo.C - PyLimitCycleAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SLimitCycleOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SLimitCycleOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SLimitCycleOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY LimitCycleAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaLimitCycle ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} LimitCycleAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(ELimitCycleOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(ELimitCycleOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser avtivp_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} ELimitCycleOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(ELimitCycleOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(ELimitCycleOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par avtivp_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} ELimitCycleOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators LimitCycle ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME LimitCycle + DEFINES ${LimitCycle_DEFINES} + ESERLIBS avtivp_ser + EPARLIBS avtivp_par) diff --git a/src/operators/LimitCycle/LimitCycle.xml b/src/operators/LimitCycle/LimitCycle.xml index 06bdcc423d2..fcfde150d60 100644 --- a/src/operators/LimitCycle/LimitCycle.xml +++ b/src/operators/LimitCycle/LimitCycle.xml @@ -12,17 +12,6 @@ avtivp_par - - - - avtLimitCycleFilter.C - - - avtivp_ser - - - avtivp_par - SpecifiedLine diff --git a/src/operators/LineSampler/CMakeLists.txt b/src/operators/LineSampler/CMakeLists.txt index 26d93689cf3..3959435bea2 100644 --- a/src/operators/LineSampler/CMakeLists.txt +++ b/src/operators/LineSampler/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(LineSampler_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(LineSampler) - -SET(COMMON_SOURCES -LineSamplerPluginInfo.C -LineSamplerCommonPluginInfo.C -LineSamplerAttributes.C -) - -SET(LIBI_SOURCES -LineSamplerPluginInfo.C -) - -SET(LIBG_SOURCES -LineSamplerGUIPluginInfo.C -QvisLineSamplerWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -LineSamplerViewerEnginePluginInfo.C -LineSamplerViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -LineSamplerViewerEnginePluginInfo.C -LineSamplerEnginePluginInfo.C -avtLineSamplerFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(ILineSamplerOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(ILineSamplerOperator visitcommon) -SET(INSTALLTARGETS ILineSamplerOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GLineSamplerOperator ${LIBG_SOURCES}) - set_target_properties(GLineSamplerOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GLineSamplerOperator visitcommon gui ) - - ADD_LIBRARY(VLineSamplerOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VLineSamplerOperator VIEWER) - TARGET_LINK_LIBRARIES(VLineSamplerOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GLineSamplerOperator VLineSamplerOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - LineSamplerScriptingPluginInfo.C - PyLineSamplerAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SLineSamplerOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SLineSamplerOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SLineSamplerOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY LineSamplerAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaLineSampler ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} LineSamplerAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(ELineSamplerOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(ELineSamplerOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} ELineSamplerOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(ELineSamplerOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(ELineSamplerOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} ELineSamplerOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators LineSampler ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME LineSampler + DEFINES ${LineSampler_DEFINES}) diff --git a/src/operators/LineSampler/LineSampler.xml b/src/operators/LineSampler/LineSampler.xml index b3e3a94f112..3dcb5b48b22 100644 --- a/src/operators/LineSampler/LineSampler.xml +++ b/src/operators/LineSampler/LineSampler.xml @@ -3,8 +3,6 @@ version="1.0" enabled="false" mdspecificcode="false" engspecificcode="false" onlyengine="false" noengine="false" iconFile="LineSampler.xpm" category="Slicing"> - - Cartesian diff --git a/src/operators/Lineout/CMakeLists.txt b/src/operators/Lineout/CMakeLists.txt index 33c4010bd03..49505b4ed61 100644 --- a/src/operators/Lineout/CMakeLists.txt +++ b/src/operators/Lineout/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(Lineout_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(Lineout) - -SET(COMMON_SOURCES -LineoutPluginInfo.C -LineoutCommonPluginInfo.C -LineoutAttributes.C -) - -SET(LIBI_SOURCES -LineoutPluginInfo.C -) - -SET(LIBG_SOURCES -LineoutGUIPluginInfo.C -QvisLineoutWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -LineoutViewerEnginePluginInfo.C -LineoutViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -LineoutViewerEnginePluginInfo.C -LineoutEnginePluginInfo.C -avtLineoutPluginFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(ILineoutOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(ILineoutOperator visitcommon) -SET(INSTALLTARGETS ILineoutOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GLineoutOperator ${LIBG_SOURCES}) - set_target_properties(GLineoutOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GLineoutOperator visitcommon gui ) - - ADD_LIBRARY(VLineoutOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VLineoutOperator VIEWER) - TARGET_LINK_LIBRARIES(VLineoutOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GLineoutOperator VLineoutOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - LineoutScriptingPluginInfo.C - PyLineoutAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SLineoutOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SLineoutOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SLineoutOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY LineoutAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaLineout ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} LineoutAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(ELineoutOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(ELineoutOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} ELineoutOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(ELineoutOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(ELineoutOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} ELineoutOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators Lineout ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME Lineout + DEFINES ${Lineout_DEFINES}) diff --git a/src/operators/Lineout/Lineout.xml b/src/operators/Lineout/Lineout.xml index 99ec3cf8837..fe4bb8db43d 100644 --- a/src/operators/Lineout/Lineout.xml +++ b/src/operators/Lineout/Lineout.xml @@ -1,8 +1,5 @@ - - avtLineoutPluginFilter.C - 0.000000 diff --git a/src/operators/Merge/CMakeLists.txt b/src/operators/Merge/CMakeLists.txt index 2f0df21d068..bc447a684de 100644 --- a/src/operators/Merge/CMakeLists.txt +++ b/src/operators/Merge/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(Merge_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(Merge) - -SET(COMMON_SOURCES -MergePluginInfo.C -MergeCommonPluginInfo.C -MergeOperatorAttributes.C -) - -SET(LIBI_SOURCES -MergePluginInfo.C -) - -SET(LIBG_SOURCES -MergeGUIPluginInfo.C -QvisMergeWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -MergeViewerEnginePluginInfo.C -MergeViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -MergeViewerEnginePluginInfo.C -MergeEnginePluginInfo.C -avtMergeFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IMergeOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IMergeOperator visitcommon) -SET(INSTALLTARGETS IMergeOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GMergeOperator ${LIBG_SOURCES}) - set_target_properties(GMergeOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GMergeOperator visitcommon gui ) - - ADD_LIBRARY(VMergeOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VMergeOperator VIEWER) - TARGET_LINK_LIBRARIES(VMergeOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GMergeOperator VMergeOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - MergeScriptingPluginInfo.C - PyMergeOperatorAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SMergeOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SMergeOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SMergeOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY MergeOperatorAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaMerge ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} MergeOperatorAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EMergeOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EMergeOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EMergeOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EMergeOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EMergeOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EMergeOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators Merge ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME Merge + DEFINES ${Merge_DEFINES}) diff --git a/src/operators/MetricThreshold/CMakeLists.txt b/src/operators/MetricThreshold/CMakeLists.txt index 1cb60622f29..8e4cbbaf7ce 100644 --- a/src/operators/MetricThreshold/CMakeLists.txt +++ b/src/operators/MetricThreshold/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(MetricThreshold_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(MetricThreshold) - -SET(COMMON_SOURCES -MetricThresholdPluginInfo.C -MetricThresholdCommonPluginInfo.C -MetricThresholdAttributes.C -) - -SET(LIBI_SOURCES -MetricThresholdPluginInfo.C -) - -SET(LIBG_SOURCES -MetricThresholdGUIPluginInfo.C -QvisMetricThresholdWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -MetricThresholdViewerEnginePluginInfo.C -MetricThresholdViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -MetricThresholdViewerEnginePluginInfo.C -MetricThresholdEnginePluginInfo.C -avtMetricThresholdFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IMetricThresholdOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IMetricThresholdOperator visitcommon) -SET(INSTALLTARGETS IMetricThresholdOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GMetricThresholdOperator ${LIBG_SOURCES}) - set_target_properties(GMetricThresholdOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GMetricThresholdOperator visitcommon gui ) - - ADD_LIBRARY(VMetricThresholdOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VMetricThresholdOperator VIEWER) - TARGET_LINK_LIBRARIES(VMetricThresholdOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GMetricThresholdOperator VMetricThresholdOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - MetricThresholdScriptingPluginInfo.C - PyMetricThresholdAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SMetricThresholdOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SMetricThresholdOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SMetricThresholdOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY MetricThresholdAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaMetricThreshold ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} MetricThresholdAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EMetricThresholdOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EMetricThresholdOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EMetricThresholdOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EMetricThresholdOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EMetricThresholdOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EMetricThresholdOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators MetricThreshold ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME MetricThreshold + DEFINES ${MetricThreshold_DEFINES}) diff --git a/src/operators/ModelFit/CMakeLists.txt b/src/operators/ModelFit/CMakeLists.txt index 023d18b5d1b..18c55f9e686 100755 --- a/src/operators/ModelFit/CMakeLists.txt +++ b/src/operators/ModelFit/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(ModelFit_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(ModelFit) - -SET(COMMON_SOURCES -ModelFitPluginInfo.C -ModelFitCommonPluginInfo.C -ModelFitAtts.C -) - -SET(LIBI_SOURCES -ModelFitPluginInfo.C -) - -SET(LIBG_SOURCES -ModelFitGUIPluginInfo.C -QvisModelFitWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -ModelFitViewerEnginePluginInfo.C -ModelFitViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -ModelFitViewerEnginePluginInfo.C -ModelFitEnginePluginInfo.C -avtModelFitFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IModelFitOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IModelFitOperator visitcommon) -SET(INSTALLTARGETS IModelFitOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GModelFitOperator ${LIBG_SOURCES}) - set_target_properties(GModelFitOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GModelFitOperator visitcommon gui ) - - ADD_LIBRARY(VModelFitOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VModelFitOperator VIEWER) - TARGET_LINK_LIBRARIES(VModelFitOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GModelFitOperator VModelFitOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - ModelFitScriptingPluginInfo.C - PyModelFitAtts.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SModelFitOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SModelFitOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SModelFitOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY ModelFitAtts.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaModelFit ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} ModelFitAtts.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EModelFitOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EModelFitOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EModelFitOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EModelFitOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EModelFitOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EModelFitOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators ModelFit ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME ModelFit + DEFINES ${ModelFit_DEFINES}) diff --git a/src/operators/MultiresControl/CMakeLists.txt b/src/operators/MultiresControl/CMakeLists.txt index 8e58bbf3859..d8518ff4ff7 100644 --- a/src/operators/MultiresControl/CMakeLists.txt +++ b/src/operators/MultiresControl/CMakeLists.txt @@ -1,91 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(MultiresControl_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(MultiresControl) - -SET(COMMON_SOURCES -MultiresControlPluginInfo.C -MultiresControlCommonPluginInfo.C -MultiresControlAttributes.C -) - -SET(LIBI_SOURCES -MultiresControlPluginInfo.C -) - -SET(LIBG_SOURCES -MultiresControlGUIPluginInfo.C -QvisMultiresControlWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -MultiresControlViewerEnginePluginInfo.C -MultiresControlViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -MultiresControlViewerEnginePluginInfo.C -MultiresControlEnginePluginInfo.C -avtMultiresControlFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -${VISIT_INCLUDE_DIR}/avt/Database/Ghost -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IMultiresControlOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IMultiresControlOperator visitcommon) -SET(INSTALLTARGETS IMultiresControlOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GMultiresControlOperator ${LIBG_SOURCES}) - set_target_properties(GMultiresControlOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GMultiresControlOperator visitcommon gui ) - - ADD_LIBRARY(VMultiresControlOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VMultiresControlOperator VIEWER) - TARGET_LINK_LIBRARIES(VMultiresControlOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GMultiresControlOperator VMultiresControlOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - MultiresControlScriptingPluginInfo.C - PyMultiresControlAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SMultiresControlOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SMultiresControlOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SMultiresControlOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY MultiresControlAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaMultiresControl ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} MultiresControlAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EMultiresControlOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EMultiresControlOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EMultiresControlOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EMultiresControlOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EMultiresControlOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EMultiresControlOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators MultiresControl ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME MultiresControl + DEFINES ${MultiresControl_DEFINES}) diff --git a/src/operators/MultiresControl/MultiresControl.xml b/src/operators/MultiresControl/MultiresControl.xml index 4b35d592c2d..3f19514b854 100644 --- a/src/operators/MultiresControl/MultiresControl.xml +++ b/src/operators/MultiresControl/MultiresControl.xml @@ -1,8 +1,5 @@ - - ${VISIT_INCLUDE_DIR}/avt/Database/Ghost - 0 diff --git a/src/operators/OnionPeel/CMakeLists.txt b/src/operators/OnionPeel/CMakeLists.txt index 6da21c700ba..202364ef02e 100644 --- a/src/operators/OnionPeel/CMakeLists.txt +++ b/src/operators/OnionPeel/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(OnionPeel_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(OnionPeel) - -SET(COMMON_SOURCES -OnionPeelPluginInfo.C -OnionPeelCommonPluginInfo.C -OnionPeelAttributes.C -) - -SET(LIBI_SOURCES -OnionPeelPluginInfo.C -) - -SET(LIBG_SOURCES -OnionPeelGUIPluginInfo.C -QvisOnionPeelWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -OnionPeelViewerEnginePluginInfo.C -OnionPeelViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -OnionPeelViewerEnginePluginInfo.C -OnionPeelEnginePluginInfo.C -avtOnionPeelFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IOnionPeelOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IOnionPeelOperator visitcommon) -SET(INSTALLTARGETS IOnionPeelOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GOnionPeelOperator ${LIBG_SOURCES}) - set_target_properties(GOnionPeelOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GOnionPeelOperator visitcommon gui ) - - ADD_LIBRARY(VOnionPeelOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VOnionPeelOperator VIEWER) - TARGET_LINK_LIBRARIES(VOnionPeelOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GOnionPeelOperator VOnionPeelOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - OnionPeelScriptingPluginInfo.C - PyOnionPeelAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SOnionPeelOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SOnionPeelOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SOnionPeelOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY OnionPeelAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaOnionPeel ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} OnionPeelAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EOnionPeelOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EOnionPeelOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EOnionPeelOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EOnionPeelOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EOnionPeelOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EOnionPeelOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators OnionPeel ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME OnionPeel + DEFINES ${OnionPeel_DEFINES}) diff --git a/src/operators/PDF/CMakeLists.txt b/src/operators/PDF/CMakeLists.txt index 38749016c1c..6a67a6d3545 100644 --- a/src/operators/PDF/CMakeLists.txt +++ b/src/operators/PDF/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(PDF_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(PDF) - -SET(COMMON_SOURCES -PDFPluginInfo.C -PDFCommonPluginInfo.C -PDFAttributes.C -) - -SET(LIBI_SOURCES -PDFPluginInfo.C -) - -SET(LIBG_SOURCES -PDFGUIPluginInfo.C -QvisPDFWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -PDFViewerEnginePluginInfo.C -PDFViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -PDFViewerEnginePluginInfo.C -PDFEnginePluginInfo.C -avtPDFFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IPDFOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IPDFOperator visitcommon) -SET(INSTALLTARGETS IPDFOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GPDFOperator ${LIBG_SOURCES}) - set_target_properties(GPDFOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GPDFOperator visitcommon gui ) - - ADD_LIBRARY(VPDFOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VPDFOperator VIEWER) - TARGET_LINK_LIBRARIES(VPDFOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GPDFOperator VPDFOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - PDFScriptingPluginInfo.C - PyPDFAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SPDFOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SPDFOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SPDFOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY PDFAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaPDF ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} PDFAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EPDFOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EPDFOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EPDFOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EPDFOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EPDFOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EPDFOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators PDF ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME PDF + DEFINES ${PDF_DEFINES}) diff --git a/src/operators/PersistentParticles/CMakeLists.txt b/src/operators/PersistentParticles/CMakeLists.txt index c80aaeb6a00..1df62b35106 100644 --- a/src/operators/PersistentParticles/CMakeLists.txt +++ b/src/operators/PersistentParticles/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(PersistentParticles_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(PersistentParticles) - -SET(COMMON_SOURCES -PersistentParticlesPluginInfo.C -PersistentParticlesCommonPluginInfo.C -PersistentParticlesAttributes.C -) - -SET(LIBI_SOURCES -PersistentParticlesPluginInfo.C -) - -SET(LIBG_SOURCES -PersistentParticlesGUIPluginInfo.C -QvisPersistentParticlesWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -PersistentParticlesViewerEnginePluginInfo.C -PersistentParticlesViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -PersistentParticlesViewerEnginePluginInfo.C -PersistentParticlesEnginePluginInfo.C -avtPersistentParticlesFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IPersistentParticlesOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IPersistentParticlesOperator visitcommon) -SET(INSTALLTARGETS IPersistentParticlesOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GPersistentParticlesOperator ${LIBG_SOURCES}) - set_target_properties(GPersistentParticlesOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GPersistentParticlesOperator visitcommon gui ) - - ADD_LIBRARY(VPersistentParticlesOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VPersistentParticlesOperator VIEWER) - TARGET_LINK_LIBRARIES(VPersistentParticlesOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GPersistentParticlesOperator VPersistentParticlesOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - PersistentParticlesScriptingPluginInfo.C - PyPersistentParticlesAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SPersistentParticlesOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SPersistentParticlesOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SPersistentParticlesOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY PersistentParticlesAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaPersistentParticles ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} PersistentParticlesAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EPersistentParticlesOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EPersistentParticlesOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EPersistentParticlesOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EPersistentParticlesOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EPersistentParticlesOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EPersistentParticlesOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators PersistentParticles ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME PersistentParticles + DEFINES ${PersistentParticles_DEFINES}) diff --git a/src/operators/Poincare/CMakeLists.txt b/src/operators/Poincare/CMakeLists.txt index bd4c0952a61..99bc9e88363 100644 --- a/src/operators/Poincare/CMakeLists.txt +++ b/src/operators/Poincare/CMakeLists.txt @@ -1,94 +1,11 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(Poincare_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(Poincare) - -SET(COMMON_SOURCES -PoincarePluginInfo.C -PoincareCommonPluginInfo.C -PoincareAttributes.C -) - -SET(LIBI_SOURCES -PoincarePluginInfo.C -) - -SET(LIBG_SOURCES -PoincareGUIPluginInfo.C -QvisPoincareWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -PoincareViewerEnginePluginInfo.C -PoincareViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -PoincareViewerEnginePluginInfo.C -PoincareEnginePluginInfo.C -avtPoincareFilter.C -FieldlineAnalyzerLib.C -RationalSurfaceLib.C -skelet.C -dir_graph.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${NEKTAR++_LIBRARY_DIR} ${NEKTAR++_LIBRARY_DIRS} ${NEKTAR++_TP_LIBRARY_DIRS} ${ACCELERATE_FRAMEWORK_LINK_FLAGS} ) - -ADD_LIBRARY(IPoincareOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IPoincareOperator visitcommon) -SET(INSTALLTARGETS IPoincareOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GPoincareOperator ${LIBG_SOURCES}) - set_target_properties(GPoincareOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GPoincareOperator visitcommon gui ) - - ADD_LIBRARY(VPoincareOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VPoincareOperator VIEWER) - TARGET_LINK_LIBRARIES(VPoincareOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GPoincareOperator VPoincareOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - PoincareScriptingPluginInfo.C - PyPoincareAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SPoincareOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SPoincareOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SPoincareOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY PoincareAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaPoincare ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} PoincareAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EPoincareOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EPoincareOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser avtivp_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EPoincareOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EPoincareOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EPoincareOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par avtivp_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EPoincareOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators Poincare ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME Poincare + ESRC FieldlineAnalyzerLib.C + RationalSurfaceLib.C + skelet.C + dir_graph.C + DEFINES ${Poincare_DEFINES} + ESERLIBS avtivp_ser + EPARLIBS avtivp_par) diff --git a/src/operators/Poincare/Poincare.xml b/src/operators/Poincare/Poincare.xml index fdcb917136b..edaea61e8d5 100644 --- a/src/operators/Poincare/Poincare.xml +++ b/src/operators/Poincare/Poincare.xml @@ -1,9 +1,6 @@ - - - avtPoincareFilter.C FieldlineAnalyzerLib.C RationalSurfaceLib.C skelet.C diff --git a/src/operators/Project/CMakeLists.txt b/src/operators/Project/CMakeLists.txt index 7af57df9a7d..74a87f88506 100644 --- a/src/operators/Project/CMakeLists.txt +++ b/src/operators/Project/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(Project_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(Project) - -SET(COMMON_SOURCES -ProjectPluginInfo.C -ProjectCommonPluginInfo.C -ProjectAttributes.C -) - -SET(LIBI_SOURCES -ProjectPluginInfo.C -) - -SET(LIBG_SOURCES -ProjectGUIPluginInfo.C -QvisProjectWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -ProjectViewerEnginePluginInfo.C -ProjectViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -ProjectViewerEnginePluginInfo.C -ProjectEnginePluginInfo.C -avtProjectFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IProjectOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IProjectOperator visitcommon) -SET(INSTALLTARGETS IProjectOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GProjectOperator ${LIBG_SOURCES}) - set_target_properties(GProjectOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GProjectOperator visitcommon gui ) - - ADD_LIBRARY(VProjectOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VProjectOperator VIEWER) - TARGET_LINK_LIBRARIES(VProjectOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GProjectOperator VProjectOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - ProjectScriptingPluginInfo.C - PyProjectAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SProjectOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SProjectOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SProjectOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY ProjectAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaProject ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} ProjectAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EProjectOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EProjectOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EProjectOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EProjectOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EProjectOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EProjectOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators Project ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME Project + DEFINES ${Project_DEFINES}) diff --git a/src/operators/RadialResample/CMakeLists.txt b/src/operators/RadialResample/CMakeLists.txt index 4068ef98273..3420ee41090 100644 --- a/src/operators/RadialResample/CMakeLists.txt +++ b/src/operators/RadialResample/CMakeLists.txt @@ -1,90 +1,7 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(RadialResample_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(RadialResample) - -SET(COMMON_SOURCES -RadialResamplePluginInfo.C -RadialResampleCommonPluginInfo.C -RadialResampleAttributes.C -) - -SET(LIBI_SOURCES -RadialResamplePluginInfo.C -) - -SET(LIBG_SOURCES -RadialResampleGUIPluginInfo.C -QvisRadialResampleWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -RadialResampleViewerEnginePluginInfo.C -RadialResampleViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -RadialResampleViewerEnginePluginInfo.C -RadialResampleEnginePluginInfo.C -avtRadialResampleFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ${NEKTAR++_LIBRARY_DIR} ${NEKTAR++_LIBRARY_DIRS} ${NEKTAR++_TP_LIBRARY_DIRS} ${ACCELERATE_FRAMEWORK_LINK_FLAGS} ) - -ADD_LIBRARY(IRadialResampleOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IRadialResampleOperator visitcommon) -SET(INSTALLTARGETS IRadialResampleOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GRadialResampleOperator ${LIBG_SOURCES}) - set_target_properties(GRadialResampleOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GRadialResampleOperator visitcommon gui ) - - ADD_LIBRARY(VRadialResampleOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VRadialResampleOperator VIEWER) - TARGET_LINK_LIBRARIES(VRadialResampleOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GRadialResampleOperator VRadialResampleOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - RadialResampleScriptingPluginInfo.C - PyRadialResampleAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SRadialResampleOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SRadialResampleOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SRadialResampleOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY RadialResampleAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaRadialResample ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} RadialResampleAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(ERadialResampleOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(ERadialResampleOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser avtivp_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} ERadialResampleOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(ERadialResampleOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(ERadialResampleOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par avtivp_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} ERadialResampleOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators RadialResample ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME RadialResample + DEFINES ${RadialResample_DEFINES} + ESERLIBS avtivp_ser + EPARLIBS avtivp_par) diff --git a/src/operators/Reflect/CMakeLists.txt b/src/operators/Reflect/CMakeLists.txt index 07c3faf55a0..0ab6c75ecf7 100644 --- a/src/operators/Reflect/CMakeLists.txt +++ b/src/operators/Reflect/CMakeLists.txt @@ -1,91 +1,6 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(Reflect_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(Reflect) - -SET(COMMON_SOURCES -ReflectPluginInfo.C -ReflectCommonPluginInfo.C -ReflectAttributes.C -) - -SET(LIBI_SOURCES -ReflectPluginInfo.C -) - -SET(LIBG_SOURCES -ReflectGUIPluginInfo.C -QvisReflectWindow.C -${COMMON_SOURCES} -QvisReflectWidget.C -) - -SET(LIBV_SOURCES -ReflectViewerEnginePluginInfo.C -ReflectViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -ReflectViewerEnginePluginInfo.C -ReflectEnginePluginInfo.C -avtReflectFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IReflectOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IReflectOperator visitcommon) -SET(INSTALLTARGETS IReflectOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GReflectOperator ${LIBG_SOURCES}) - set_target_properties(GReflectOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GReflectOperator visitcommon gui ) - - ADD_LIBRARY(VReflectOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VReflectOperator VIEWER) - TARGET_LINK_LIBRARIES(VReflectOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GReflectOperator VReflectOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - ReflectScriptingPluginInfo.C - PyReflectAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SReflectOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SReflectOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SReflectOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY ReflectAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaReflect ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} ReflectAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EReflectOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EReflectOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EReflectOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EReflectOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EReflectOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EReflectOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators Reflect ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME Reflect + GSRC QvisReflectWidget.C + DEFINES ${Reflect_DEFINES}) diff --git a/src/operators/Reflect/Reflect.xml b/src/operators/Reflect/Reflect.xml index 761ff6b9091..045f042a39e 100644 --- a/src/operators/Reflect/Reflect.xml +++ b/src/operators/Reflect/Reflect.xml @@ -3,9 +3,6 @@ QvisReflectWidget.C - - QvisReflectWidget.h - PXPYPZ diff --git a/src/operators/Remap/CMakeLists.txt b/src/operators/Remap/CMakeLists.txt index 6d82a4fc5a9..83dddaa77a2 100644 --- a/src/operators/Remap/CMakeLists.txt +++ b/src/operators/Remap/CMakeLists.txt @@ -1,91 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(Remap_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(Remap) - -SET(COMMON_SOURCES -RemapPluginInfo.C -RemapCommonPluginInfo.C -RemapAttributes.C -) - -SET(LIBI_SOURCES -RemapPluginInfo.C -) - -SET(LIBG_SOURCES -RemapGUIPluginInfo.C -QvisRemapWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -RemapViewerEnginePluginInfo.C -RemapViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -RemapViewerEnginePluginInfo.C -RemapEnginePluginInfo.C -avtRemapFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -${VISIT_INCLUDE_DIR}/third_party_builtin/verdict -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IRemapOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IRemapOperator visitcommon) -SET(INSTALLTARGETS IRemapOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GRemapOperator ${LIBG_SOURCES}) - set_target_properties(GRemapOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GRemapOperator visitcommon gui ) - - ADD_LIBRARY(VRemapOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VRemapOperator VIEWER) - TARGET_LINK_LIBRARIES(VRemapOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GRemapOperator VRemapOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - RemapScriptingPluginInfo.C - PyRemapAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SRemapOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SRemapOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SRemapOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY RemapAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaRemap ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} RemapAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(ERemapOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(ERemapOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} ERemapOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(ERemapOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(ERemapOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} ERemapOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators Remap ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME Remap + DEFINES ${Remap_DEFINES}) diff --git a/src/operators/Remap/Remap.xml b/src/operators/Remap/Remap.xml index bf1714f6e72..c7c1fe34b7b 100644 --- a/src/operators/Remap/Remap.xml +++ b/src/operators/Remap/Remap.xml @@ -1,8 +1,5 @@ - - ${VISIT_INCLUDE_DIR}/third_party_builtin/verdict - intrinsic diff --git a/src/operators/RemoveCells/CMakeLists.txt b/src/operators/RemoveCells/CMakeLists.txt index 37897c58e3c..f12aaab4ada 100644 --- a/src/operators/RemoveCells/CMakeLists.txt +++ b/src/operators/RemoveCells/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(RemoveCells_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(RemoveCells) - -SET(COMMON_SOURCES -RemoveCellsPluginInfo.C -RemoveCellsCommonPluginInfo.C -RemoveCellsAttributes.C -) - -SET(LIBI_SOURCES -RemoveCellsPluginInfo.C -) - -SET(LIBG_SOURCES -RemoveCellsGUIPluginInfo.C -QvisRemoveCellsWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -RemoveCellsViewerEnginePluginInfo.C -RemoveCellsViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -RemoveCellsViewerEnginePluginInfo.C -RemoveCellsEnginePluginInfo.C -avtRemoveCellsFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IRemoveCellsOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IRemoveCellsOperator visitcommon) -SET(INSTALLTARGETS IRemoveCellsOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GRemoveCellsOperator ${LIBG_SOURCES}) - set_target_properties(GRemoveCellsOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GRemoveCellsOperator visitcommon gui ) - - ADD_LIBRARY(VRemoveCellsOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VRemoveCellsOperator VIEWER) - TARGET_LINK_LIBRARIES(VRemoveCellsOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GRemoveCellsOperator VRemoveCellsOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - RemoveCellsScriptingPluginInfo.C - PyRemoveCellsAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SRemoveCellsOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SRemoveCellsOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SRemoveCellsOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY RemoveCellsAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaRemoveCells ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} RemoveCellsAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(ERemoveCellsOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(ERemoveCellsOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} ERemoveCellsOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(ERemoveCellsOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(ERemoveCellsOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} ERemoveCellsOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators RemoveCells ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME RemoveCells + DEFINES ${RemoveCells_DEFINES}) diff --git a/src/operators/Replicate/CMakeLists.txt b/src/operators/Replicate/CMakeLists.txt index 1c3579431b7..5cedd751425 100644 --- a/src/operators/Replicate/CMakeLists.txt +++ b/src/operators/Replicate/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(Replicate_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(Replicate) - -SET(COMMON_SOURCES -ReplicatePluginInfo.C -ReplicateCommonPluginInfo.C -ReplicateAttributes.C -) - -SET(LIBI_SOURCES -ReplicatePluginInfo.C -) - -SET(LIBG_SOURCES -ReplicateGUIPluginInfo.C -QvisReplicateWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -ReplicateViewerEnginePluginInfo.C -ReplicateViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -ReplicateViewerEnginePluginInfo.C -ReplicateEnginePluginInfo.C -avtReplicateFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IReplicateOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IReplicateOperator visitcommon) -SET(INSTALLTARGETS IReplicateOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GReplicateOperator ${LIBG_SOURCES}) - set_target_properties(GReplicateOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GReplicateOperator visitcommon gui ) - - ADD_LIBRARY(VReplicateOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VReplicateOperator VIEWER) - TARGET_LINK_LIBRARIES(VReplicateOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GReplicateOperator VReplicateOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - ReplicateScriptingPluginInfo.C - PyReplicateAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SReplicateOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SReplicateOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SReplicateOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY ReplicateAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaReplicate ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} ReplicateAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EReplicateOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EReplicateOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EReplicateOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EReplicateOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EReplicateOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EReplicateOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators Replicate ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME Replicate + DEFINES ${Replicate_DEFINES}) diff --git a/src/operators/Resample/CMakeLists.txt b/src/operators/Resample/CMakeLists.txt index ba2b83bb6d2..99e86300854 100644 --- a/src/operators/Resample/CMakeLists.txt +++ b/src/operators/Resample/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(Resample_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(Resample) - -SET(COMMON_SOURCES -ResamplePluginInfo.C -ResampleCommonPluginInfo.C -ResampleAttributes.C -) - -SET(LIBI_SOURCES -ResamplePluginInfo.C -) - -SET(LIBG_SOURCES -ResampleGUIPluginInfo.C -QvisResampleWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -ResampleViewerEnginePluginInfo.C -ResampleViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -ResampleViewerEnginePluginInfo.C -ResampleEnginePluginInfo.C -avtResamplePluginFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IResampleOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IResampleOperator visitcommon) -SET(INSTALLTARGETS IResampleOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GResampleOperator ${LIBG_SOURCES}) - set_target_properties(GResampleOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GResampleOperator visitcommon gui ) - - ADD_LIBRARY(VResampleOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VResampleOperator VIEWER) - TARGET_LINK_LIBRARIES(VResampleOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GResampleOperator VResampleOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - ResampleScriptingPluginInfo.C - PyResampleAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SResampleOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SResampleOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SResampleOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY ResampleAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaResample ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} ResampleAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EResampleOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EResampleOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EResampleOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EResampleOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EResampleOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EResampleOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators Resample ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME Resample + DEFINES ${Resample_DEFINES}) diff --git a/src/operators/Resample/Resample.xml b/src/operators/Resample/Resample.xml index 3a9c7094d2c..53b5f0fd7de 100644 --- a/src/operators/Resample/Resample.xml +++ b/src/operators/Resample/Resample.xml @@ -1,8 +1,5 @@ - - avtResamplePluginFilter.C - random diff --git a/src/operators/Revolve/CMakeLists.txt b/src/operators/Revolve/CMakeLists.txt index 5bc874aa880..661211aa005 100644 --- a/src/operators/Revolve/CMakeLists.txt +++ b/src/operators/Revolve/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(Revolve_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(Revolve) - -SET(COMMON_SOURCES -RevolvePluginInfo.C -RevolveCommonPluginInfo.C -RevolveAttributes.C -) - -SET(LIBI_SOURCES -RevolvePluginInfo.C -) - -SET(LIBG_SOURCES -RevolveGUIPluginInfo.C -QvisRevolveWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -RevolveViewerEnginePluginInfo.C -RevolveViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -RevolveViewerEnginePluginInfo.C -RevolveEnginePluginInfo.C -avtRevolveFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IRevolveOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IRevolveOperator visitcommon) -SET(INSTALLTARGETS IRevolveOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GRevolveOperator ${LIBG_SOURCES}) - set_target_properties(GRevolveOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GRevolveOperator visitcommon gui ) - - ADD_LIBRARY(VRevolveOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VRevolveOperator VIEWER) - TARGET_LINK_LIBRARIES(VRevolveOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GRevolveOperator VRevolveOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - RevolveScriptingPluginInfo.C - PyRevolveAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SRevolveOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SRevolveOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SRevolveOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY RevolveAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaRevolve ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} RevolveAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(ERevolveOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(ERevolveOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} ERevolveOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(ERevolveOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(ERevolveOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} ERevolveOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators Revolve ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME Revolve + DEFINES ${Revolve_DEFINES}) diff --git a/src/operators/SPHResample/CMakeLists.txt b/src/operators/SPHResample/CMakeLists.txt index 6a023268687..44895eeb856 100644 --- a/src/operators/SPHResample/CMakeLists.txt +++ b/src/operators/SPHResample/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(SPHResample_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(SPHResample) - -SET(COMMON_SOURCES -SPHResamplePluginInfo.C -SPHResampleCommonPluginInfo.C -SPHResampleAttributes.C -) - -SET(LIBI_SOURCES -SPHResamplePluginInfo.C -) - -SET(LIBG_SOURCES -SPHResampleGUIPluginInfo.C -QvisSPHResampleWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -SPHResampleViewerEnginePluginInfo.C -SPHResampleViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -SPHResampleViewerEnginePluginInfo.C -SPHResampleEnginePluginInfo.C -avtSPHResampleFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(ISPHResampleOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(ISPHResampleOperator visitcommon) -SET(INSTALLTARGETS ISPHResampleOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GSPHResampleOperator ${LIBG_SOURCES}) - set_target_properties(GSPHResampleOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GSPHResampleOperator visitcommon gui ) - - ADD_LIBRARY(VSPHResampleOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VSPHResampleOperator VIEWER) - TARGET_LINK_LIBRARIES(VSPHResampleOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GSPHResampleOperator VSPHResampleOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - SPHResampleScriptingPluginInfo.C - PySPHResampleAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SSPHResampleOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SSPHResampleOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SSPHResampleOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY SPHResampleAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaSPHResample ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} SPHResampleAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(ESPHResampleOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(ESPHResampleOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} ESPHResampleOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(ESPHResampleOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(ESPHResampleOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} ESPHResampleOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators SPHResample ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME SPHResample + DEFINES ${SPHResample_DEFINES}) diff --git a/src/operators/Slice/CMakeLists.txt b/src/operators/Slice/CMakeLists.txt index 6837b02e72a..d56c69c71bb 100644 --- a/src/operators/Slice/CMakeLists.txt +++ b/src/operators/Slice/CMakeLists.txt @@ -1,99 +1,16 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(Slice_operator) -ADD_OPERATOR_CODE_GEN_TARGETS(Slice) +visit_add_operator_plugin( + ONAME Slice + DEFINES ${Slice_DEFINES}) -SET(COMMON_SOURCES -SlicePluginInfo.C -SliceCommonPluginInfo.C -SliceAttributes.C -) -SET(LIBI_SOURCES -SlicePluginInfo.C -) +if(HAVES_LIBVTKM) + target_link_libraries(ESliceOperator_ser PUBLIC vtkm_cont vtkm_filter_core vtkm_filter_contour vtkm_worklet vtkm_filter_vector_analysis) -SET(LIBG_SOURCES -SliceGUIPluginInfo.C -QvisSliceWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -SliceViewerEnginePluginInfo.C -SliceViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -SliceViewerEnginePluginInfo.C -SliceEnginePluginInfo.C -avtSliceFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -${VTKm_INCLUDE_DIRS} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(ISliceOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(ISliceOperator visitcommon) -SET(INSTALLTARGETS ISliceOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GSliceOperator ${LIBG_SOURCES}) - set_target_properties(GSliceOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GSliceOperator visitcommon gui ) - - ADD_LIBRARY(VSliceOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VSliceOperator VIEWER) - TARGET_LINK_LIBRARIES(VSliceOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GSliceOperator VSliceOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - SliceScriptingPluginInfo.C - PySliceAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SSliceOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SSliceOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SSliceOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY SliceAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaSlice ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} SliceAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(ESliceOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(ESliceOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -if(HAVE_LIBVTKM) - target_link_libraries(ESliceOperator_ser vtkm_cont vtkm_filter_core vtkm_filter_contour vtkm_worklet vtkm_filter_vector_analysis) -endif() - -SET(INSTALLTARGETS ${INSTALLTARGETS} ESliceOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(ESliceOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(ESliceOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - if(HAVE_LIBVTKM) - target_link_libraries(ESliceOperator_par vtkm_cont vtkm_filter_core vtkm_filter_contour vtkm_worklet vtkm_filter_vector_analysis) + if(VISIT_PARALLEL) + target_link_libraries(ESliceOperator_par PUBLIC vtkm_cont vtkm_filter_core vtkm_filter_contour vtkm_worklet vtkm_filter_vector_analysis) endif() +endif() - SET(INSTALLTARGETS ${INSTALLTARGETS} ESliceOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators Slice ${INSTALLTARGETS}) diff --git a/src/operators/Slice/Slice.xml b/src/operators/Slice/Slice.xml index a42b1c717b6..4e3e199e45b 100644 --- a/src/operators/Slice/Slice.xml +++ b/src/operators/Slice/Slice.xml @@ -1,9 +1,6 @@ - - -I${VTKm_INCLUDE_DIRS} - XAxis YAxis diff --git a/src/operators/Slice/SliceAttributes.code b/src/operators/Slice/SliceAttributes.code index e24ae851a8e..982ba1cd6ff 100644 --- a/src/operators/Slice/SliceAttributes.code +++ b/src/operators/Slice/SliceAttributes.code @@ -393,6 +393,12 @@ SliceAttributes::SetValue(const std::string &name, const bool &value) } Target: xml2cmake -Condition: HAVE_LIBVTKM -ELinkLibraries: vtkm_cont vtkm_filter_core vtkm_filter_contour vtkm_worklet vtkm_filter_vector_analysis +Verbatim: Post +if(HAVES_LIBVTKM) + target_link_libraries(ESliceOperator_ser PUBLIC vtkm_cont vtkm_filter_core vtkm_filter_contour vtkm_worklet vtkm_filter_vector_analysis) + + if(VISIT_PARALLEL) + target_link_libraries(ESliceOperator_par PUBLIC vtkm_cont vtkm_filter_core vtkm_filter_contour vtkm_worklet vtkm_filter_vector_analysis) + endif() +endif() diff --git a/src/operators/Slice/avtSliceFilter.C b/src/operators/Slice/avtSliceFilter.C index c09d8866d07..ae46dc80ab3 100644 --- a/src/operators/Slice/avtSliceFilter.C +++ b/src/operators/Slice/avtSliceFilter.C @@ -10,6 +10,7 @@ #include +#include // for HAVE_LIBVTKM #ifdef HAVE_LIBVTKM #include #include diff --git a/src/operators/Smooth/CMakeLists.txt b/src/operators/Smooth/CMakeLists.txt index a1ec80e2e72..4c0409f05d8 100644 --- a/src/operators/Smooth/CMakeLists.txt +++ b/src/operators/Smooth/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(Smooth_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(Smooth) - -SET(COMMON_SOURCES -SmoothPluginInfo.C -SmoothCommonPluginInfo.C -SmoothOperatorAttributes.C -) - -SET(LIBI_SOURCES -SmoothPluginInfo.C -) - -SET(LIBG_SOURCES -SmoothGUIPluginInfo.C -QvisSmoothWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -SmoothViewerEnginePluginInfo.C -SmoothViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -SmoothViewerEnginePluginInfo.C -SmoothEnginePluginInfo.C -avtSmoothFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(ISmoothOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(ISmoothOperator visitcommon) -SET(INSTALLTARGETS ISmoothOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GSmoothOperator ${LIBG_SOURCES}) - set_target_properties(GSmoothOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GSmoothOperator visitcommon gui ) - - ADD_LIBRARY(VSmoothOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VSmoothOperator VIEWER) - TARGET_LINK_LIBRARIES(VSmoothOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GSmoothOperator VSmoothOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - SmoothScriptingPluginInfo.C - PySmoothOperatorAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SSmoothOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SSmoothOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SSmoothOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY SmoothOperatorAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaSmooth ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} SmoothOperatorAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(ESmoothOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(ESmoothOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} ESmoothOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(ESmoothOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(ESmoothOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} ESmoothOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators Smooth ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME Smooth + DEFINES ${Smooth_DEFINES}) diff --git a/src/operators/SphereSlice/CMakeLists.txt b/src/operators/SphereSlice/CMakeLists.txt index 2fbf440ab86..761e99d6ce7 100644 --- a/src/operators/SphereSlice/CMakeLists.txt +++ b/src/operators/SphereSlice/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(SphereSlice_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(SphereSlice) - -SET(COMMON_SOURCES -SphereSlicePluginInfo.C -SphereSliceCommonPluginInfo.C -SphereSliceAttributes.C -) - -SET(LIBI_SOURCES -SphereSlicePluginInfo.C -) - -SET(LIBG_SOURCES -SphereSliceGUIPluginInfo.C -QvisSphereSliceWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -SphereSliceViewerEnginePluginInfo.C -SphereSliceViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -SphereSliceViewerEnginePluginInfo.C -SphereSliceEnginePluginInfo.C -avtSphereSliceFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(ISphereSliceOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(ISphereSliceOperator visitcommon) -SET(INSTALLTARGETS ISphereSliceOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GSphereSliceOperator ${LIBG_SOURCES}) - set_target_properties(GSphereSliceOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GSphereSliceOperator visitcommon gui ) - - ADD_LIBRARY(VSphereSliceOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VSphereSliceOperator VIEWER) - TARGET_LINK_LIBRARIES(VSphereSliceOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GSphereSliceOperator VSphereSliceOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - SphereSliceScriptingPluginInfo.C - PySphereSliceAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SSphereSliceOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SSphereSliceOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SSphereSliceOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY SphereSliceAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaSphereSlice ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} SphereSliceAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(ESphereSliceOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(ESphereSliceOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} ESphereSliceOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(ESphereSliceOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(ESphereSliceOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} ESphereSliceOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators SphereSlice ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME SphereSlice + DEFINES ${SphereSlice_DEFINES}) diff --git a/src/operators/Stagger/CMakeLists.txt b/src/operators/Stagger/CMakeLists.txt index 12df71e0fbe..cb7fd5a09a2 100644 --- a/src/operators/Stagger/CMakeLists.txt +++ b/src/operators/Stagger/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(Stagger_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(Stagger) - -SET(COMMON_SOURCES -StaggerPluginInfo.C -StaggerCommonPluginInfo.C -StaggerAttributes.C -) - -SET(LIBI_SOURCES -StaggerPluginInfo.C -) - -SET(LIBG_SOURCES -StaggerGUIPluginInfo.C -QvisStaggerWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -StaggerViewerEnginePluginInfo.C -StaggerViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -StaggerViewerEnginePluginInfo.C -StaggerEnginePluginInfo.C -avtStaggerFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IStaggerOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IStaggerOperator visitcommon) -SET(INSTALLTARGETS IStaggerOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GStaggerOperator ${LIBG_SOURCES}) - set_target_properties(GStaggerOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GStaggerOperator visitcommon gui ) - - ADD_LIBRARY(VStaggerOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VStaggerOperator VIEWER) - TARGET_LINK_LIBRARIES(VStaggerOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GStaggerOperator VStaggerOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - StaggerScriptingPluginInfo.C - PyStaggerAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SStaggerOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SStaggerOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SStaggerOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY StaggerAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaStagger ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} StaggerAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EStaggerOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EStaggerOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EStaggerOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EStaggerOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EStaggerOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EStaggerOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators Stagger ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME Stagger + DEFINES ${Stagger_DEFINES}) diff --git a/src/operators/StatisticalTrends/CMakeLists.txt b/src/operators/StatisticalTrends/CMakeLists.txt index 85524efeea0..0f35836dc6f 100644 --- a/src/operators/StatisticalTrends/CMakeLists.txt +++ b/src/operators/StatisticalTrends/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(StatisticalTrends_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(StatisticalTrends) - -SET(COMMON_SOURCES -StatisticalTrendsPluginInfo.C -StatisticalTrendsCommonPluginInfo.C -StatisticalTrendsAttributes.C -) - -SET(LIBI_SOURCES -StatisticalTrendsPluginInfo.C -) - -SET(LIBG_SOURCES -StatisticalTrendsGUIPluginInfo.C -QvisStatisticalTrendsWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -StatisticalTrendsViewerEnginePluginInfo.C -StatisticalTrendsViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -StatisticalTrendsViewerEnginePluginInfo.C -StatisticalTrendsEnginePluginInfo.C -avtStatisticalTrendsFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IStatisticalTrendsOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IStatisticalTrendsOperator visitcommon) -SET(INSTALLTARGETS IStatisticalTrendsOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GStatisticalTrendsOperator ${LIBG_SOURCES}) - set_target_properties(GStatisticalTrendsOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GStatisticalTrendsOperator visitcommon gui ) - - ADD_LIBRARY(VStatisticalTrendsOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VStatisticalTrendsOperator VIEWER) - TARGET_LINK_LIBRARIES(VStatisticalTrendsOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GStatisticalTrendsOperator VStatisticalTrendsOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - StatisticalTrendsScriptingPluginInfo.C - PyStatisticalTrendsAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SStatisticalTrendsOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SStatisticalTrendsOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SStatisticalTrendsOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY StatisticalTrendsAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaStatisticalTrends ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} StatisticalTrendsAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EStatisticalTrendsOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EStatisticalTrendsOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EStatisticalTrendsOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EStatisticalTrendsOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EStatisticalTrendsOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EStatisticalTrendsOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators StatisticalTrends ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME StatisticalTrends + DEFINES ${StatisticalTrends_DEFINES}) diff --git a/src/operators/SubdivideQuads/CMakeLists.txt b/src/operators/SubdivideQuads/CMakeLists.txt index eff33e69c66..c3b29e7b484 100644 --- a/src/operators/SubdivideQuads/CMakeLists.txt +++ b/src/operators/SubdivideQuads/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(SubdivideQuads_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(SubdivideQuads) - -SET(COMMON_SOURCES -SubdivideQuadsPluginInfo.C -SubdivideQuadsCommonPluginInfo.C -SubdivideQuadsAttributes.C -) - -SET(LIBI_SOURCES -SubdivideQuadsPluginInfo.C -) - -SET(LIBG_SOURCES -SubdivideQuadsGUIPluginInfo.C -QvisSubdivideQuadsWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -SubdivideQuadsViewerEnginePluginInfo.C -SubdivideQuadsViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -SubdivideQuadsViewerEnginePluginInfo.C -SubdivideQuadsEnginePluginInfo.C -avtSubdivideQuadsFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(ISubdivideQuadsOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(ISubdivideQuadsOperator visitcommon) -SET(INSTALLTARGETS ISubdivideQuadsOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GSubdivideQuadsOperator ${LIBG_SOURCES}) - set_target_properties(GSubdivideQuadsOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GSubdivideQuadsOperator visitcommon gui ) - - ADD_LIBRARY(VSubdivideQuadsOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VSubdivideQuadsOperator VIEWER) - TARGET_LINK_LIBRARIES(VSubdivideQuadsOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GSubdivideQuadsOperator VSubdivideQuadsOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - SubdivideQuadsScriptingPluginInfo.C - PySubdivideQuadsAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SSubdivideQuadsOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SSubdivideQuadsOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SSubdivideQuadsOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY SubdivideQuadsAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaSubdivideQuads ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} SubdivideQuadsAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(ESubdivideQuadsOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(ESubdivideQuadsOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} ESubdivideQuadsOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(ESubdivideQuadsOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(ESubdivideQuadsOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} ESubdivideQuadsOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators SubdivideQuads ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME SubdivideQuads + DEFINES ${SubdivideQuads_DEFINES}) diff --git a/src/operators/SurfCompPrep/CMakeLists.txt b/src/operators/SurfCompPrep/CMakeLists.txt index e6eefcfb8d0..bae385ca1d4 100644 --- a/src/operators/SurfCompPrep/CMakeLists.txt +++ b/src/operators/SurfCompPrep/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(SurfCompPrep_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(SurfCompPrep) - -SET(COMMON_SOURCES -SurfCompPrepPluginInfo.C -SurfCompPrepCommonPluginInfo.C -SurfCompPrepAttributes.C -) - -SET(LIBI_SOURCES -SurfCompPrepPluginInfo.C -) - -SET(LIBG_SOURCES -SurfCompPrepGUIPluginInfo.C -QvisSurfCompPrepWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -SurfCompPrepViewerEnginePluginInfo.C -SurfCompPrepViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -SurfCompPrepViewerEnginePluginInfo.C -SurfCompPrepEnginePluginInfo.C -avtSurfCompPrepFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(ISurfCompPrepOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(ISurfCompPrepOperator visitcommon) -SET(INSTALLTARGETS ISurfCompPrepOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GSurfCompPrepOperator ${LIBG_SOURCES}) - set_target_properties(GSurfCompPrepOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GSurfCompPrepOperator visitcommon gui ) - - ADD_LIBRARY(VSurfCompPrepOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VSurfCompPrepOperator VIEWER) - TARGET_LINK_LIBRARIES(VSurfCompPrepOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GSurfCompPrepOperator VSurfCompPrepOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - SurfCompPrepScriptingPluginInfo.C - PySurfCompPrepAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SSurfCompPrepOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SSurfCompPrepOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SSurfCompPrepOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY SurfCompPrepAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaSurfCompPrep ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} SurfCompPrepAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(ESurfCompPrepOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(ESurfCompPrepOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} ESurfCompPrepOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(ESurfCompPrepOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(ESurfCompPrepOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} ESurfCompPrepOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators SurfCompPrep ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME SurfCompPrep + DEFINES ${SurfCompPrep_DEFINES}) diff --git a/src/operators/SurfaceNormal/CMakeLists.txt b/src/operators/SurfaceNormal/CMakeLists.txt index bfba9f9f893..585fa575894 100644 --- a/src/operators/SurfaceNormal/CMakeLists.txt +++ b/src/operators/SurfaceNormal/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(SurfaceNormal_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(SurfaceNormal) - -SET(COMMON_SOURCES -SurfaceNormalPluginInfo.C -SurfaceNormalCommonPluginInfo.C -SurfaceNormalAttributes.C -) - -SET(LIBI_SOURCES -SurfaceNormalPluginInfo.C -) - -SET(LIBG_SOURCES -SurfaceNormalGUIPluginInfo.C -QvisSurfaceNormalWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -SurfaceNormalViewerEnginePluginInfo.C -SurfaceNormalViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -SurfaceNormalViewerEnginePluginInfo.C -SurfaceNormalEnginePluginInfo.C -avtSurfaceNormalFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(ISurfaceNormalOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(ISurfaceNormalOperator visitcommon) -SET(INSTALLTARGETS ISurfaceNormalOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GSurfaceNormalOperator ${LIBG_SOURCES}) - set_target_properties(GSurfaceNormalOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GSurfaceNormalOperator visitcommon gui ) - - ADD_LIBRARY(VSurfaceNormalOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VSurfaceNormalOperator VIEWER) - TARGET_LINK_LIBRARIES(VSurfaceNormalOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GSurfaceNormalOperator VSurfaceNormalOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - SurfaceNormalScriptingPluginInfo.C - PySurfaceNormalAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SSurfaceNormalOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SSurfaceNormalOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SSurfaceNormalOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY SurfaceNormalAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaSurfaceNormal ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} SurfaceNormalAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(ESurfaceNormalOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(ESurfaceNormalOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} ESurfaceNormalOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(ESurfaceNormalOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(ESurfaceNormalOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} ESurfaceNormalOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators SurfaceNormal ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME SurfaceNormal + DEFINES ${SurfaceNormal_DEFINES}) diff --git a/src/operators/Tessellate/CMakeLists.txt b/src/operators/Tessellate/CMakeLists.txt index e64fd741bef..1adc072f1bf 100644 --- a/src/operators/Tessellate/CMakeLists.txt +++ b/src/operators/Tessellate/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(Tessellate_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(Tessellate) - -SET(COMMON_SOURCES -TessellatePluginInfo.C -TessellateCommonPluginInfo.C -TessellateAttributes.C -) - -SET(LIBI_SOURCES -TessellatePluginInfo.C -) - -SET(LIBG_SOURCES -TessellateGUIPluginInfo.C -QvisTessellateWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -TessellateViewerEnginePluginInfo.C -TessellateViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -TessellateViewerEnginePluginInfo.C -TessellateEnginePluginInfo.C -avtTessellateFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(ITessellateOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(ITessellateOperator visitcommon) -SET(INSTALLTARGETS ITessellateOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GTessellateOperator ${LIBG_SOURCES}) - set_target_properties(GTessellateOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GTessellateOperator visitcommon gui ) - - ADD_LIBRARY(VTessellateOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VTessellateOperator VIEWER) - TARGET_LINK_LIBRARIES(VTessellateOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GTessellateOperator VTessellateOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - TessellateScriptingPluginInfo.C - PyTessellateAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(STessellateOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(STessellateOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} STessellateOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY TessellateAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaTessellate ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} TessellateAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(ETessellateOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(ETessellateOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} ETessellateOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(ETessellateOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(ETessellateOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} ETessellateOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators Tessellate ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME Tessellate + DEFINES ${Tessellate_DEFINES}) diff --git a/src/operators/ThreeSlice/CMakeLists.txt b/src/operators/ThreeSlice/CMakeLists.txt index b3cd5dfac0b..e0d9a7d57fe 100644 --- a/src/operators/ThreeSlice/CMakeLists.txt +++ b/src/operators/ThreeSlice/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(ThreeSlice_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(ThreeSlice) - -SET(COMMON_SOURCES -ThreeSlicePluginInfo.C -ThreeSliceCommonPluginInfo.C -ThreeSliceAttributes.C -) - -SET(LIBI_SOURCES -ThreeSlicePluginInfo.C -) - -SET(LIBG_SOURCES -ThreeSliceGUIPluginInfo.C -QvisThreeSliceWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -ThreeSliceViewerEnginePluginInfo.C -ThreeSliceViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -ThreeSliceViewerEnginePluginInfo.C -ThreeSliceEnginePluginInfo.C -avtThreeSliceFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IThreeSliceOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IThreeSliceOperator visitcommon) -SET(INSTALLTARGETS IThreeSliceOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GThreeSliceOperator ${LIBG_SOURCES}) - set_target_properties(GThreeSliceOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GThreeSliceOperator visitcommon gui ) - - ADD_LIBRARY(VThreeSliceOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VThreeSliceOperator VIEWER) - TARGET_LINK_LIBRARIES(VThreeSliceOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GThreeSliceOperator VThreeSliceOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - ThreeSliceScriptingPluginInfo.C - PyThreeSliceAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SThreeSliceOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SThreeSliceOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SThreeSliceOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY ThreeSliceAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaThreeSlice ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} ThreeSliceAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EThreeSliceOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EThreeSliceOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EThreeSliceOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EThreeSliceOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EThreeSliceOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EThreeSliceOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators ThreeSlice ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME ThreeSlice + DEFINES ${ThreeSlice_DEFINES}) diff --git a/src/operators/Threshold/CMakeLists.txt b/src/operators/Threshold/CMakeLists.txt index 52770589ad9..1b702581b83 100644 --- a/src/operators/Threshold/CMakeLists.txt +++ b/src/operators/Threshold/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(Threshold_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(Threshold) - -SET(COMMON_SOURCES -ThresholdPluginInfo.C -ThresholdCommonPluginInfo.C -ThresholdAttributes.C -) - -SET(LIBI_SOURCES -ThresholdPluginInfo.C -) - -SET(LIBG_SOURCES -ThresholdGUIPluginInfo.C -QvisThresholdWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -ThresholdViewerEnginePluginInfo.C -ThresholdViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -ThresholdViewerEnginePluginInfo.C -ThresholdEnginePluginInfo.C -avtThresholdPluginFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IThresholdOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IThresholdOperator visitcommon) -SET(INSTALLTARGETS IThresholdOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GThresholdOperator ${LIBG_SOURCES}) - set_target_properties(GThresholdOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GThresholdOperator visitcommon gui ) - - ADD_LIBRARY(VThresholdOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VThresholdOperator VIEWER) - TARGET_LINK_LIBRARIES(VThresholdOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GThresholdOperator VThresholdOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - ThresholdScriptingPluginInfo.C - PyThresholdAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SThresholdOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SThresholdOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SThresholdOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY ThresholdAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaThreshold ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} ThresholdAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EThresholdOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EThresholdOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EThresholdOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EThresholdOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EThresholdOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EThresholdOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators Threshold ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME Threshold + DEFINES ${Threshold_DEFINES}) diff --git a/src/operators/Threshold/Threshold.xml b/src/operators/Threshold/Threshold.xml index ff6fee8d2c2..c04e8ffa951 100644 --- a/src/operators/Threshold/Threshold.xml +++ b/src/operators/Threshold/Threshold.xml @@ -1,8 +1,5 @@ - - avtThresholdPluginFilter.C - diff --git a/src/operators/ToroidalPoloidalProjection/CMakeLists.txt b/src/operators/ToroidalPoloidalProjection/CMakeLists.txt index 237a16b47d7..6408badc39e 100644 --- a/src/operators/ToroidalPoloidalProjection/CMakeLists.txt +++ b/src/operators/ToroidalPoloidalProjection/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(ToroidalPoloidalProjection_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(ToroidalPoloidalProjection) - -SET(COMMON_SOURCES -ToroidalPoloidalProjectionPluginInfo.C -ToroidalPoloidalProjectionCommonPluginInfo.C -ToroidalPoloidalProjection.C -) - -SET(LIBI_SOURCES -ToroidalPoloidalProjectionPluginInfo.C -) - -SET(LIBG_SOURCES -ToroidalPoloidalProjectionGUIPluginInfo.C -QvisToroidalPoloidalProjectionWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -ToroidalPoloidalProjectionViewerEnginePluginInfo.C -ToroidalPoloidalProjectionViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -ToroidalPoloidalProjectionViewerEnginePluginInfo.C -ToroidalPoloidalProjectionEnginePluginInfo.C -avtToroidalPoloidalProjectionFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IToroidalPoloidalProjectionOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IToroidalPoloidalProjectionOperator visitcommon) -SET(INSTALLTARGETS IToroidalPoloidalProjectionOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GToroidalPoloidalProjectionOperator ${LIBG_SOURCES}) - set_target_properties(GToroidalPoloidalProjectionOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GToroidalPoloidalProjectionOperator visitcommon gui ) - - ADD_LIBRARY(VToroidalPoloidalProjectionOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VToroidalPoloidalProjectionOperator VIEWER) - TARGET_LINK_LIBRARIES(VToroidalPoloidalProjectionOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GToroidalPoloidalProjectionOperator VToroidalPoloidalProjectionOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - ToroidalPoloidalProjectionScriptingPluginInfo.C - PyToroidalPoloidalProjection.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SToroidalPoloidalProjectionOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SToroidalPoloidalProjectionOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SToroidalPoloidalProjectionOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY ToroidalPoloidalProjection.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaToroidalPoloidalProjection ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} ToroidalPoloidalProjection.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EToroidalPoloidalProjectionOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EToroidalPoloidalProjectionOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EToroidalPoloidalProjectionOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EToroidalPoloidalProjectionOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EToroidalPoloidalProjectionOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EToroidalPoloidalProjectionOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators ToroidalPoloidalProjection ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME ToroidalPoloidalProjection + DEFINES ${ToroidalPoloidalProjection_DEFINES}) diff --git a/src/operators/Transform/CMakeLists.txt b/src/operators/Transform/CMakeLists.txt index be617699e16..0dc9cd810d5 100644 --- a/src/operators/Transform/CMakeLists.txt +++ b/src/operators/Transform/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(Transform_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(Transform) - -SET(COMMON_SOURCES -TransformPluginInfo.C -TransformCommonPluginInfo.C -TransformAttributes.C -) - -SET(LIBI_SOURCES -TransformPluginInfo.C -) - -SET(LIBG_SOURCES -TransformGUIPluginInfo.C -QvisTransformWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -TransformViewerEnginePluginInfo.C -TransformViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -TransformViewerEnginePluginInfo.C -TransformEnginePluginInfo.C -avtTransformFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(ITransformOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(ITransformOperator visitcommon) -SET(INSTALLTARGETS ITransformOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GTransformOperator ${LIBG_SOURCES}) - set_target_properties(GTransformOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GTransformOperator visitcommon gui ) - - ADD_LIBRARY(VTransformOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VTransformOperator VIEWER) - TARGET_LINK_LIBRARIES(VTransformOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GTransformOperator VTransformOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - TransformScriptingPluginInfo.C - PyTransformAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(STransformOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(STransformOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} STransformOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY TransformAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaTransform ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} TransformAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(ETransformOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(ETransformOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} ETransformOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(ETransformOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(ETransformOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} ETransformOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators Transform ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME Transform + DEFINES ${Transform_DEFINES}) diff --git a/src/operators/TriangulateRegularPoints/CMakeLists.txt b/src/operators/TriangulateRegularPoints/CMakeLists.txt index 3e79ac1ab36..d9cf941f4bf 100644 --- a/src/operators/TriangulateRegularPoints/CMakeLists.txt +++ b/src/operators/TriangulateRegularPoints/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(TriangulateRegularPoints_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(TriangulateRegularPoints) - -SET(COMMON_SOURCES -TriangulateRegularPointsPluginInfo.C -TriangulateRegularPointsCommonPluginInfo.C -TriangulateRegularPointsAttributes.C -) - -SET(LIBI_SOURCES -TriangulateRegularPointsPluginInfo.C -) - -SET(LIBG_SOURCES -TriangulateRegularPointsGUIPluginInfo.C -QvisTriangulateRegularPointsWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -TriangulateRegularPointsViewerEnginePluginInfo.C -TriangulateRegularPointsViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -TriangulateRegularPointsViewerEnginePluginInfo.C -TriangulateRegularPointsEnginePluginInfo.C -avtTriangulateRegularPointsFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(ITriangulateRegularPointsOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(ITriangulateRegularPointsOperator visitcommon) -SET(INSTALLTARGETS ITriangulateRegularPointsOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GTriangulateRegularPointsOperator ${LIBG_SOURCES}) - set_target_properties(GTriangulateRegularPointsOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GTriangulateRegularPointsOperator visitcommon gui ) - - ADD_LIBRARY(VTriangulateRegularPointsOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VTriangulateRegularPointsOperator VIEWER) - TARGET_LINK_LIBRARIES(VTriangulateRegularPointsOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GTriangulateRegularPointsOperator VTriangulateRegularPointsOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - TriangulateRegularPointsScriptingPluginInfo.C - PyTriangulateRegularPointsAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(STriangulateRegularPointsOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(STriangulateRegularPointsOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} STriangulateRegularPointsOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY TriangulateRegularPointsAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaTriangulateRegularPoints ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} TriangulateRegularPointsAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(ETriangulateRegularPointsOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(ETriangulateRegularPointsOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} ETriangulateRegularPointsOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(ETriangulateRegularPointsOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(ETriangulateRegularPointsOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} ETriangulateRegularPointsOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators TriangulateRegularPoints ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME TriangulateRegularPoints + DEFINES ${TriangulateRegularPoints_DEFINES}) diff --git a/src/operators/Tube/CMakeLists.txt b/src/operators/Tube/CMakeLists.txt index 1b658d5048e..701b3e15f81 100644 --- a/src/operators/Tube/CMakeLists.txt +++ b/src/operators/Tube/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(Tube_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(Tube) - -SET(COMMON_SOURCES -TubePluginInfo.C -TubeCommonPluginInfo.C -TubeAttributes.C -) - -SET(LIBI_SOURCES -TubePluginInfo.C -) - -SET(LIBG_SOURCES -TubeGUIPluginInfo.C -QvisTubeWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -TubeViewerEnginePluginInfo.C -TubeViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -TubeViewerEnginePluginInfo.C -TubeEnginePluginInfo.C -avtTubeFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(ITubeOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(ITubeOperator visitcommon) -SET(INSTALLTARGETS ITubeOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GTubeOperator ${LIBG_SOURCES}) - set_target_properties(GTubeOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GTubeOperator visitcommon gui ) - - ADD_LIBRARY(VTubeOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VTubeOperator VIEWER) - TARGET_LINK_LIBRARIES(VTubeOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GTubeOperator VTubeOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - TubeScriptingPluginInfo.C - PyTubeAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(STubeOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(STubeOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} STubeOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY TubeAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaTube ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} TubeAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(ETubeOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(ETubeOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} ETubeOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(ETubeOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(ETubeOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} ETubeOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators Tube ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME Tube + DEFINES ${Tube_DEFINES}) diff --git a/src/operators/ZoneDump/CMakeLists.txt b/src/operators/ZoneDump/CMakeLists.txt index 6bc4ed5b9f0..5079f32a106 100644 --- a/src/operators/ZoneDump/CMakeLists.txt +++ b/src/operators/ZoneDump/CMakeLists.txt @@ -1,90 +1,5 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(ZoneDump_operator) - -ADD_OPERATOR_CODE_GEN_TARGETS(ZoneDump) - -SET(COMMON_SOURCES -ZoneDumpPluginInfo.C -ZoneDumpCommonPluginInfo.C -ZoneDumpAttributes.C -) - -SET(LIBI_SOURCES -ZoneDumpPluginInfo.C -) - -SET(LIBG_SOURCES -ZoneDumpGUIPluginInfo.C -QvisZoneDumpWindow.C -${COMMON_SOURCES} -) - -SET(LIBV_SOURCES -ZoneDumpViewerEnginePluginInfo.C -ZoneDumpViewerPluginInfo.C -${COMMON_SOURCES} -) - -SET(LIBE_SOURCES -ZoneDumpViewerEnginePluginInfo.C -ZoneDumpEnginePluginInfo.C -avtZoneDumpFilter.C -${COMMON_SOURCES} -) - - -INCLUDE_DIRECTORIES( -${CMAKE_CURRENT_SOURCE_DIR} -${VISIT_OPERATOR_INCLUDES} -) - -LINK_DIRECTORIES(${VISIT_LIBRARY_DIR} ) - -ADD_LIBRARY(IZoneDumpOperator ${LIBI_SOURCES}) -TARGET_LINK_LIBRARIES(IZoneDumpOperator visitcommon) -SET(INSTALLTARGETS IZoneDumpOperator) - -IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - ADD_LIBRARY(GZoneDumpOperator ${LIBG_SOURCES}) - set_target_properties(GZoneDumpOperator PROPERTIES AUTOMOC ON) - TARGET_LINK_LIBRARIES(GZoneDumpOperator visitcommon gui ) - - ADD_LIBRARY(VZoneDumpOperator ${LIBV_SOURCES}) - ADD_TARGET_DEFINITIONS(VZoneDumpOperator VIEWER) - TARGET_LINK_LIBRARIES(VZoneDumpOperator visitcommon viewer ) - - SET(INSTALLTARGETS ${INSTALLTARGETS} GZoneDumpOperator VZoneDumpOperator) - - IF(VISIT_PYTHON_SCRIPTING) - SET(LIBS_SOURCES - ZoneDumpScriptingPluginInfo.C - PyZoneDumpAttributes.C - ${COMMON_SOURCES} - ) - ADD_LIBRARY(SZoneDumpOperator ${LIBS_SOURCES}) - TARGET_LINK_LIBRARIES(SZoneDumpOperator visitcommon visitpy ${PYTHON_LIBRARY}) - SET(INSTALLTARGETS ${INSTALLTARGETS} SZoneDumpOperator) - ENDIF(VISIT_PYTHON_SCRIPTING) - - IF(VISIT_JAVA) - FILE(COPY ZoneDumpAttributes.java DESTINATION ${JavaClient_BINARY_DIR}/src/operators) - ADD_CUSTOM_TARGET(JavaZoneDump ALL ${Java_JAVAC_EXECUTABLE} ${VISIT_Java_FLAGS} -d ${JavaClient_BINARY_DIR} -classpath ${JavaClient_BINARY_DIR} -sourcepath ${JavaClient_BINARY_DIR} ZoneDumpAttributes.java - DEPENDS JavaClient - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - ENDIF(VISIT_JAVA) -ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY) - -ADD_LIBRARY(EZoneDumpOperator_ser ${LIBE_SOURCES}) -TARGET_LINK_LIBRARIES(EZoneDumpOperator_ser visitcommon avtpipeline_ser avtexpressions_ser avtfilters_ser ) -SET(INSTALLTARGETS ${INSTALLTARGETS} EZoneDumpOperator_ser) - -IF(VISIT_PARALLEL) - ADD_PARALLEL_LIBRARY(EZoneDumpOperator_par ${LIBE_SOURCES}) - TARGET_LINK_LIBRARIES(EZoneDumpOperator_par visitcommon avtpipeline_par avtexpressions_par avtfilters_par ) - SET(INSTALLTARGETS ${INSTALLTARGETS} EZoneDumpOperator_par) -ENDIF(VISIT_PARALLEL) - -VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_OUTPUT_DIR(operators ${INSTALLTARGETS}) -VISIT_PLUGIN_TARGET_FOLDER(operators ZoneDump ${INSTALLTARGETS}) +visit_add_operator_plugin( + ONAME ZoneDump + DEFINES ${ZoneDump_DEFINES}) diff --git a/src/tools/dev/xml/GenerateCMake.h b/src/tools/dev/xml/GenerateCMake.h index c2b5d31dc37..8c763db7670 100644 --- a/src/tools/dev/xml/GenerateCMake.h +++ b/src/tools/dev/xml/GenerateCMake.h @@ -697,9 +697,124 @@ class CMakeGeneratorPlugin : public Plugin return false; } + void WriteCMake_PluginSources(QTextStream &out, + const QString component, + const std::vector files) + { + out << Endl; + out << " " << component << "SRC " << files[0]; + for(size_t i = 1; i < files.size(); ++i) + out << Endl << " " << files[i]; + } + + void WriteCMake_PluginLibs(QTextStream &out, + const QString component, + const std::vector libs) + { + out << Endl; + QString IOne(" "); + if (component == "V" || component=="G") + IOne += QString(" "); + out << " " << component << "LIBS" << IOne << libs[0]; + for(size_t i = 1; i < libs.size(); ++i) + out << Endl << " " << libs[i]; + } + + void WriteCMake_PluginConditionalDefinitions(QTextStream &out) + { + QStringList conditions, defs; + if(GetCondition("Definitions:", conditions, defs)) + { + out << Endl; + out << "set(" << name << "_DEFINES)" << Endl; + for (int i = 0; i < conditions.size(); ++i) + { + out << "if(" << conditions[i] << ")" << Endl; + out << " list(APPEND " << name << "_DEFINES " << defs[i]; + out << ")" << Endl; + out << "endif()" << Endl; + out << Endl; + } + } + } + + void WriteCMake_PluginVerbatim(QTextStream &out, QString prepost) + { + if (atts != NULL && atts->codeFile != NULL) + { + QStringList logic; + if(atts->codeFile->GetVerbatim(prepost, logic)) + { + out << Endl; + out << "\n" << logic[0] << Endl; + out << Endl; + } + } + } + + void WriteCMake_PlotOperator(QTextStream &out, const QString &guilibname, const QString &viewerlibname) + { + WriteCMake_PluginVerbatim(out, "Pre"); + WriteCMake_PluginConditionalDefinitions(out); + out << Endl; + if (type == "plot") + { + out << "visit_add_plot_plugin(" << Endl; + out << " PNAME " << name; + } + else + { + out << "visit_add_operator_plugin(" << Endl; + out << " ONAME " << name; + } + if (customgfiles) + { + WriteCMake_PluginSources(out, "G", gfiles); + } + if (customvfiles) + { + WriteCMake_PluginSources(out, "V", vfiles); + } + if (customefiles) + { + WriteCMake_PluginSources(out, "E", efiles); + } + + out << "\n DEFINES ${" << name << "_DEFINES}"; + + // gui libs + if (!glibs.empty()) + { + WriteCMake_PluginLibs(out, "G", glibs); + } + + // viewer libs + if (!vlibs.empty()) + { + WriteCMake_PluginLibs(out, "V", vlibs); + } + // engine libs + if (!elibsSer.empty()) + { + WriteCMake_PluginLibs(out, "ESER", elibsSer); + } + + if (!elibsPar.empty()) + { + WriteCMake_PluginLibs(out, "EPAR", elibsPar); + } + + out << ")" << Endl; + + WriteCMake_PluginVerbatim(out, "Post"); + } + + void WriteCMake_PlotOperatorOLD(QTextStream &out, + const QString &guilibname, + const QString &viewerlibname) { bool useFortran = false; diff --git a/src/visitpy/common/visitmodule.C b/src/visitpy/common/visitmodule.C index 74630280169..c59f8dd7cf1 100644 --- a/src/visitpy/common/visitmodule.C +++ b/src/visitpy/common/visitmodule.C @@ -4,7 +4,7 @@ #include #include -#include // for VISIT_VERSION +#include // for VISIT_VERSION, HAVE_LIBVTKM #if !defined(_WIN32) #include #else From 029aaa4a1be9a756788a4830f5e828cc620565e6 Mon Sep 17 00:00:00 2001 From: Kathleen Biagas Date: Fri, 10 Jan 2025 13:00:59 -0800 Subject: [PATCH 2/3] Update how conditional link libs and conditional defines are handled. Rerun xml2cmake on all operators. Fix Volume plot .code file and re-run xml2cmake. --- src/operators/AMRStitchCell/CMakeLists.txt | 3 +- .../AxisAlignedSlice4D/CMakeLists.txt | 3 +- src/operators/BoundaryOp/CMakeLists.txt | 3 +- src/operators/Box/CMakeLists.txt | 3 +- .../CartographicProjection/CMakeLists.txt | 1 - src/operators/Clip/CMakeLists.txt | 3 +- src/operators/Cone/CMakeLists.txt | 3 +- src/operators/ConnCompReduce/CMakeLists.txt | 3 +- .../ConnectedComponents/CMakeLists.txt | 3 +- src/operators/Context/CMakeLists.txt | 3 +- src/operators/CoordSwap/CMakeLists.txt | 3 +- src/operators/CracksClipper/CMakeLists.txt | 3 +- src/operators/CreateBonds/CMakeLists.txt | 3 +- src/operators/Cylinder/CMakeLists.txt | 3 +- src/operators/DataBinning/CMakeLists.txt | 3 +- src/operators/Decimate/CMakeLists.txt | 3 +- src/operators/DeferExpression/CMakeLists.txt | 3 +- src/operators/Delaunay/CMakeLists.txt | 3 +- src/operators/Displace/CMakeLists.txt | 3 +- src/operators/DualMesh/CMakeLists.txt | 3 +- src/operators/Edge/CMakeLists.txt | 3 +- src/operators/Elevate/CMakeLists.txt | 3 +- src/operators/EllipsoidSlice/CMakeLists.txt | 3 +- src/operators/Explode/CMakeLists.txt | 3 +- src/operators/ExternalSurface/CMakeLists.txt | 3 +- .../ExtractPointFunction2D/CMakeLists.txt | 3 +- src/operators/Extrude/CMakeLists.txt | 3 +- src/operators/ExtrudeStacked/CMakeLists.txt | 3 +- src/operators/FFT/CMakeLists.txt | 3 +- .../FiveFoldTetSubdivision/CMakeLists.txt | 3 +- src/operators/Flux/CMakeLists.txt | 3 +- src/operators/IndexSelect/CMakeLists.txt | 3 +- src/operators/IntegralCurve/CMakeLists.txt | 1 - src/operators/InverseGhostZone/CMakeLists.txt | 3 +- src/operators/Isosurface/CMakeLists.txt | 3 +- src/operators/Isovolume/CMakeLists.txt | 7 +- src/operators/LCS/CMakeLists.txt | 1 - src/operators/Lagrangian/CMakeLists.txt | 1 - src/operators/LimitCycle/CMakeLists.txt | 1 - src/operators/LineSampler/CMakeLists.txt | 3 +- src/operators/Lineout/CMakeLists.txt | 3 +- src/operators/Merge/CMakeLists.txt | 3 +- src/operators/MetricThreshold/CMakeLists.txt | 3 +- src/operators/ModelFit/CMakeLists.txt | 3 +- src/operators/MultiresControl/CMakeLists.txt | 3 +- src/operators/OnionPeel/CMakeLists.txt | 3 +- src/operators/PDF/CMakeLists.txt | 3 +- .../PersistentParticles/CMakeLists.txt | 3 +- src/operators/Poincare/CMakeLists.txt | 1 - src/operators/Project/CMakeLists.txt | 3 +- src/operators/RadialResample/CMakeLists.txt | 1 - src/operators/Reflect/CMakeLists.txt | 3 +- src/operators/Remap/CMakeLists.txt | 3 +- src/operators/RemoveCells/CMakeLists.txt | 3 +- src/operators/Replicate/CMakeLists.txt | 3 +- src/operators/Resample/CMakeLists.txt | 3 +- src/operators/Revolve/CMakeLists.txt | 3 +- src/operators/SPHResample/CMakeLists.txt | 3 +- src/operators/Slice/CMakeLists.txt | 18 +- src/operators/Slice/SliceAttributes.code | 10 +- src/operators/Smooth/CMakeLists.txt | 3 +- src/operators/SphereSlice/CMakeLists.txt | 3 +- src/operators/Stagger/CMakeLists.txt | 3 +- .../StatisticalTrends/CMakeLists.txt | 3 +- src/operators/SubdivideQuads/CMakeLists.txt | 3 +- src/operators/SurfCompPrep/CMakeLists.txt | 3 +- src/operators/SurfaceNormal/CMakeLists.txt | 3 +- src/operators/Tessellate/CMakeLists.txt | 3 +- src/operators/ThreeSlice/CMakeLists.txt | 3 +- src/operators/Threshold/CMakeLists.txt | 3 +- .../ToroidalPoloidalProjection/CMakeLists.txt | 3 +- src/operators/Transform/CMakeLists.txt | 3 +- .../TriangulateRegularPoints/CMakeLists.txt | 3 +- src/operators/Tube/CMakeLists.txt | 3 +- src/operators/ZoneDump/CMakeLists.txt | 3 +- src/plots/Volume/CMakeLists.txt | 43 +- src/plots/Volume/VolumeAttributes.code | 7 +- src/tools/dev/xml/GenerateCMake.h | 392 +++--------------- 78 files changed, 158 insertions(+), 521 deletions(-) diff --git a/src/operators/AMRStitchCell/CMakeLists.txt b/src/operators/AMRStitchCell/CMakeLists.txt index 558511ebb73..636a2f34ce4 100644 --- a/src/operators/AMRStitchCell/CMakeLists.txt +++ b/src/operators/AMRStitchCell/CMakeLists.txt @@ -3,5 +3,4 @@ visit_add_operator_plugin( ONAME AMRStitchCell ESRC AMRStitchCellTesselations3D.C - AMRStitchCellTesselations2D.C - DEFINES ${AMRStitchCell_DEFINES}) + AMRStitchCellTesselations2D.C) diff --git a/src/operators/AxisAlignedSlice4D/CMakeLists.txt b/src/operators/AxisAlignedSlice4D/CMakeLists.txt index c94cbb53ce7..f398d45cf28 100644 --- a/src/operators/AxisAlignedSlice4D/CMakeLists.txt +++ b/src/operators/AxisAlignedSlice4D/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME AxisAlignedSlice4D - DEFINES ${AxisAlignedSlice4D_DEFINES}) + ONAME AxisAlignedSlice4D) diff --git a/src/operators/BoundaryOp/CMakeLists.txt b/src/operators/BoundaryOp/CMakeLists.txt index 9fa55548d4e..4fe6d3bbde9 100644 --- a/src/operators/BoundaryOp/CMakeLists.txt +++ b/src/operators/BoundaryOp/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME BoundaryOp - DEFINES ${BoundaryOp_DEFINES}) + ONAME BoundaryOp) diff --git a/src/operators/Box/CMakeLists.txt b/src/operators/Box/CMakeLists.txt index 88ebc8d9f79..7352a5e0b43 100644 --- a/src/operators/Box/CMakeLists.txt +++ b/src/operators/Box/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME Box - DEFINES ${Box_DEFINES}) + ONAME Box) diff --git a/src/operators/CartographicProjection/CMakeLists.txt b/src/operators/CartographicProjection/CMakeLists.txt index 6d4b5c1958f..94099435245 100644 --- a/src/operators/CartographicProjection/CMakeLists.txt +++ b/src/operators/CartographicProjection/CMakeLists.txt @@ -2,6 +2,5 @@ visit_add_operator_plugin( ONAME CartographicProjection - DEFINES ${CartographicProjection_DEFINES} ESERLIBS VTK::GeovisCore EPARLIBS VTK::GeovisCore) diff --git a/src/operators/Clip/CMakeLists.txt b/src/operators/Clip/CMakeLists.txt index 7ae65694637..1e51dc515e6 100644 --- a/src/operators/Clip/CMakeLists.txt +++ b/src/operators/Clip/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME Clip - DEFINES ${Clip_DEFINES}) + ONAME Clip) diff --git a/src/operators/Cone/CMakeLists.txt b/src/operators/Cone/CMakeLists.txt index 18f57fd6ecc..3255694d1e5 100644 --- a/src/operators/Cone/CMakeLists.txt +++ b/src/operators/Cone/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME Cone - DEFINES ${Cone_DEFINES}) + ONAME Cone) diff --git a/src/operators/ConnCompReduce/CMakeLists.txt b/src/operators/ConnCompReduce/CMakeLists.txt index c822afe207c..39fbcc9dd87 100644 --- a/src/operators/ConnCompReduce/CMakeLists.txt +++ b/src/operators/ConnCompReduce/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME ConnCompReduce - DEFINES ${ConnCompReduce_DEFINES}) + ONAME ConnCompReduce) diff --git a/src/operators/ConnectedComponents/CMakeLists.txt b/src/operators/ConnectedComponents/CMakeLists.txt index a6ac5cb0e74..658efb0011a 100644 --- a/src/operators/ConnectedComponents/CMakeLists.txt +++ b/src/operators/ConnectedComponents/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME ConnectedComponents - DEFINES ${ConnectedComponents_DEFINES}) + ONAME ConnectedComponents) diff --git a/src/operators/Context/CMakeLists.txt b/src/operators/Context/CMakeLists.txt index 2afdb0dad82..3b13c2124c8 100644 --- a/src/operators/Context/CMakeLists.txt +++ b/src/operators/Context/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME Context - DEFINES ${Context_DEFINES}) + ONAME Context) diff --git a/src/operators/CoordSwap/CMakeLists.txt b/src/operators/CoordSwap/CMakeLists.txt index 25be41ba586..8b643d75efd 100644 --- a/src/operators/CoordSwap/CMakeLists.txt +++ b/src/operators/CoordSwap/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME CoordSwap - DEFINES ${CoordSwap_DEFINES}) + ONAME CoordSwap) diff --git a/src/operators/CracksClipper/CMakeLists.txt b/src/operators/CracksClipper/CMakeLists.txt index a47ec8ca0a7..b2295e50099 100644 --- a/src/operators/CracksClipper/CMakeLists.txt +++ b/src/operators/CracksClipper/CMakeLists.txt @@ -5,5 +5,4 @@ visit_add_operator_plugin( ESRC avtRemoveCracksFilter.C avtCracksDensityFilter.C vtkCracksClipper.C - vtkCrackWidthFilter.C - DEFINES ${CracksClipper_DEFINES}) + vtkCrackWidthFilter.C) diff --git a/src/operators/CreateBonds/CMakeLists.txt b/src/operators/CreateBonds/CMakeLists.txt index 5849e2d141b..f1b4cd7f682 100644 --- a/src/operators/CreateBonds/CMakeLists.txt +++ b/src/operators/CreateBonds/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME CreateBonds - DEFINES ${CreateBonds_DEFINES}) + ONAME CreateBonds) diff --git a/src/operators/Cylinder/CMakeLists.txt b/src/operators/Cylinder/CMakeLists.txt index cff62e8d778..f76b0c173be 100644 --- a/src/operators/Cylinder/CMakeLists.txt +++ b/src/operators/Cylinder/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME Cylinder - DEFINES ${Cylinder_DEFINES}) + ONAME Cylinder) diff --git a/src/operators/DataBinning/CMakeLists.txt b/src/operators/DataBinning/CMakeLists.txt index a8b1d196c09..7e1d455eac3 100644 --- a/src/operators/DataBinning/CMakeLists.txt +++ b/src/operators/DataBinning/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME DataBinning - DEFINES ${DataBinning_DEFINES}) + ONAME DataBinning) diff --git a/src/operators/Decimate/CMakeLists.txt b/src/operators/Decimate/CMakeLists.txt index 503bc95b134..0624e5ec2ee 100644 --- a/src/operators/Decimate/CMakeLists.txt +++ b/src/operators/Decimate/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME Decimate - DEFINES ${Decimate_DEFINES}) + ONAME Decimate) diff --git a/src/operators/DeferExpression/CMakeLists.txt b/src/operators/DeferExpression/CMakeLists.txt index fa789113d67..f8cbb02d8df 100644 --- a/src/operators/DeferExpression/CMakeLists.txt +++ b/src/operators/DeferExpression/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME DeferExpression - DEFINES ${DeferExpression_DEFINES}) + ONAME DeferExpression) diff --git a/src/operators/Delaunay/CMakeLists.txt b/src/operators/Delaunay/CMakeLists.txt index 8fdf24d6b1a..54511585496 100644 --- a/src/operators/Delaunay/CMakeLists.txt +++ b/src/operators/Delaunay/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME Delaunay - DEFINES ${Delaunay_DEFINES}) + ONAME Delaunay) diff --git a/src/operators/Displace/CMakeLists.txt b/src/operators/Displace/CMakeLists.txt index e4c444b37d6..d3f0b3d80b1 100644 --- a/src/operators/Displace/CMakeLists.txt +++ b/src/operators/Displace/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME Displace - DEFINES ${Displace_DEFINES}) + ONAME Displace) diff --git a/src/operators/DualMesh/CMakeLists.txt b/src/operators/DualMesh/CMakeLists.txt index e1043c720b2..3502280c79a 100644 --- a/src/operators/DualMesh/CMakeLists.txt +++ b/src/operators/DualMesh/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME DualMesh - DEFINES ${DualMesh_DEFINES}) + ONAME DualMesh) diff --git a/src/operators/Edge/CMakeLists.txt b/src/operators/Edge/CMakeLists.txt index b5c1ea37fad..0d989c013fe 100644 --- a/src/operators/Edge/CMakeLists.txt +++ b/src/operators/Edge/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME Edge - DEFINES ${Edge_DEFINES}) + ONAME Edge) diff --git a/src/operators/Elevate/CMakeLists.txt b/src/operators/Elevate/CMakeLists.txt index 06a1e0f53e1..13a91ac8a6e 100644 --- a/src/operators/Elevate/CMakeLists.txt +++ b/src/operators/Elevate/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME Elevate - DEFINES ${Elevate_DEFINES}) + ONAME Elevate) diff --git a/src/operators/EllipsoidSlice/CMakeLists.txt b/src/operators/EllipsoidSlice/CMakeLists.txt index 70955d620c4..3b47b026f01 100644 --- a/src/operators/EllipsoidSlice/CMakeLists.txt +++ b/src/operators/EllipsoidSlice/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME EllipsoidSlice - DEFINES ${EllipsoidSlice_DEFINES}) + ONAME EllipsoidSlice) diff --git a/src/operators/Explode/CMakeLists.txt b/src/operators/Explode/CMakeLists.txt index 58c98bc4070..a1cf8fcc9fa 100644 --- a/src/operators/Explode/CMakeLists.txt +++ b/src/operators/Explode/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME Explode - DEFINES ${Explode_DEFINES}) + ONAME Explode) diff --git a/src/operators/ExternalSurface/CMakeLists.txt b/src/operators/ExternalSurface/CMakeLists.txt index 095451cc731..25d93410058 100644 --- a/src/operators/ExternalSurface/CMakeLists.txt +++ b/src/operators/ExternalSurface/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME ExternalSurface - DEFINES ${ExternalSurface_DEFINES}) + ONAME ExternalSurface) diff --git a/src/operators/ExtractPointFunction2D/CMakeLists.txt b/src/operators/ExtractPointFunction2D/CMakeLists.txt index 505561dd27b..91a999451cd 100644 --- a/src/operators/ExtractPointFunction2D/CMakeLists.txt +++ b/src/operators/ExtractPointFunction2D/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME ExtractPointFunction2D - DEFINES ${ExtractPointFunction2D_DEFINES}) + ONAME ExtractPointFunction2D) diff --git a/src/operators/Extrude/CMakeLists.txt b/src/operators/Extrude/CMakeLists.txt index 9a29689be3d..c81c9348954 100644 --- a/src/operators/Extrude/CMakeLists.txt +++ b/src/operators/Extrude/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME Extrude - DEFINES ${Extrude_DEFINES}) + ONAME Extrude) diff --git a/src/operators/ExtrudeStacked/CMakeLists.txt b/src/operators/ExtrudeStacked/CMakeLists.txt index e08791fa36a..d7c43cdff5d 100644 --- a/src/operators/ExtrudeStacked/CMakeLists.txt +++ b/src/operators/ExtrudeStacked/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME ExtrudeStacked - DEFINES ${ExtrudeStacked_DEFINES}) + ONAME ExtrudeStacked) diff --git a/src/operators/FFT/CMakeLists.txt b/src/operators/FFT/CMakeLists.txt index c07c73acb34..3eac258885c 100644 --- a/src/operators/FFT/CMakeLists.txt +++ b/src/operators/FFT/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME FFT - DEFINES ${FFT_DEFINES}) + ONAME FFT) diff --git a/src/operators/FiveFoldTetSubdivision/CMakeLists.txt b/src/operators/FiveFoldTetSubdivision/CMakeLists.txt index e1754effc64..0464aa2c821 100644 --- a/src/operators/FiveFoldTetSubdivision/CMakeLists.txt +++ b/src/operators/FiveFoldTetSubdivision/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME FiveFoldTetSubdivision - DEFINES ${FiveFoldTetSubdivision_DEFINES}) + ONAME FiveFoldTetSubdivision) diff --git a/src/operators/Flux/CMakeLists.txt b/src/operators/Flux/CMakeLists.txt index 2b9d0ff633b..ad169a3a0ce 100644 --- a/src/operators/Flux/CMakeLists.txt +++ b/src/operators/Flux/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME Flux - DEFINES ${Flux_DEFINES}) + ONAME Flux) diff --git a/src/operators/IndexSelect/CMakeLists.txt b/src/operators/IndexSelect/CMakeLists.txt index 4e064080464..01a305a02bf 100644 --- a/src/operators/IndexSelect/CMakeLists.txt +++ b/src/operators/IndexSelect/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME IndexSelect - DEFINES ${IndexSelect_DEFINES}) + ONAME IndexSelect) diff --git a/src/operators/IntegralCurve/CMakeLists.txt b/src/operators/IntegralCurve/CMakeLists.txt index 667f94e37b3..6101a178b3e 100644 --- a/src/operators/IntegralCurve/CMakeLists.txt +++ b/src/operators/IntegralCurve/CMakeLists.txt @@ -2,6 +2,5 @@ visit_add_operator_plugin( ONAME IntegralCurve - DEFINES ${IntegralCurve_DEFINES} ESERLIBS avtivp_ser EPARLIBS avtivp_par) diff --git a/src/operators/InverseGhostZone/CMakeLists.txt b/src/operators/InverseGhostZone/CMakeLists.txt index 36c235497db..12c76efd8cc 100644 --- a/src/operators/InverseGhostZone/CMakeLists.txt +++ b/src/operators/InverseGhostZone/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME InverseGhostZone - DEFINES ${InverseGhostZone_DEFINES}) + ONAME InverseGhostZone) diff --git a/src/operators/Isosurface/CMakeLists.txt b/src/operators/Isosurface/CMakeLists.txt index 60b6d04b3a8..fc5ce0ca17b 100644 --- a/src/operators/Isosurface/CMakeLists.txt +++ b/src/operators/Isosurface/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME Isosurface - DEFINES ${Isosurface_DEFINES}) + ONAME Isosurface) diff --git a/src/operators/Isovolume/CMakeLists.txt b/src/operators/Isovolume/CMakeLists.txt index 3f6af8f3ba4..b17c30793ca 100644 --- a/src/operators/Isovolume/CMakeLists.txt +++ b/src/operators/Isovolume/CMakeLists.txt @@ -1,5 +1,10 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake +if(HAVE_LIBVTKM) + set(Isovolume_ELibs vtkm_cont vtkm_filter_core vtkm_filter_contour vtkm_filter_entity_extraction vtkm_filter_field_conversion vtkm_worklet) +endif() + visit_add_operator_plugin( ONAME Isovolume - DEFINES ${Isovolume_DEFINES}) + ESERLIBS ${Isovolume_ELibs} + EPARLIBS ${Isovolume_ELibs}) diff --git a/src/operators/LCS/CMakeLists.txt b/src/operators/LCS/CMakeLists.txt index ad9a1f80640..a9898f26d7b 100644 --- a/src/operators/LCS/CMakeLists.txt +++ b/src/operators/LCS/CMakeLists.txt @@ -4,6 +4,5 @@ visit_add_operator_plugin( ONAME LCS ESRC avtLCSFilterFTLE.C avtLCSFilterFSLE.C - DEFINES ${LCS_DEFINES} ESERLIBS avtivp_ser EPARLIBS avtivp_par) diff --git a/src/operators/Lagrangian/CMakeLists.txt b/src/operators/Lagrangian/CMakeLists.txt index a18e51a9540..8618ad3250d 100644 --- a/src/operators/Lagrangian/CMakeLists.txt +++ b/src/operators/Lagrangian/CMakeLists.txt @@ -2,6 +2,5 @@ visit_add_operator_plugin( ONAME Lagrangian - DEFINES ${Lagrangian_DEFINES} ESERLIBS avtivp_ser EPARLIBS avtivp_par) diff --git a/src/operators/LimitCycle/CMakeLists.txt b/src/operators/LimitCycle/CMakeLists.txt index 1e3a529e31f..3c73e2e278b 100644 --- a/src/operators/LimitCycle/CMakeLists.txt +++ b/src/operators/LimitCycle/CMakeLists.txt @@ -2,6 +2,5 @@ visit_add_operator_plugin( ONAME LimitCycle - DEFINES ${LimitCycle_DEFINES} ESERLIBS avtivp_ser EPARLIBS avtivp_par) diff --git a/src/operators/LineSampler/CMakeLists.txt b/src/operators/LineSampler/CMakeLists.txt index 3959435bea2..9c7f9140d18 100644 --- a/src/operators/LineSampler/CMakeLists.txt +++ b/src/operators/LineSampler/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME LineSampler - DEFINES ${LineSampler_DEFINES}) + ONAME LineSampler) diff --git a/src/operators/Lineout/CMakeLists.txt b/src/operators/Lineout/CMakeLists.txt index 49505b4ed61..d0907164718 100644 --- a/src/operators/Lineout/CMakeLists.txt +++ b/src/operators/Lineout/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME Lineout - DEFINES ${Lineout_DEFINES}) + ONAME Lineout) diff --git a/src/operators/Merge/CMakeLists.txt b/src/operators/Merge/CMakeLists.txt index bc447a684de..b9c4ae1229f 100644 --- a/src/operators/Merge/CMakeLists.txt +++ b/src/operators/Merge/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME Merge - DEFINES ${Merge_DEFINES}) + ONAME Merge) diff --git a/src/operators/MetricThreshold/CMakeLists.txt b/src/operators/MetricThreshold/CMakeLists.txt index 8e4cbbaf7ce..1ab143fd7fc 100644 --- a/src/operators/MetricThreshold/CMakeLists.txt +++ b/src/operators/MetricThreshold/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME MetricThreshold - DEFINES ${MetricThreshold_DEFINES}) + ONAME MetricThreshold) diff --git a/src/operators/ModelFit/CMakeLists.txt b/src/operators/ModelFit/CMakeLists.txt index 18c55f9e686..449db176ee4 100755 --- a/src/operators/ModelFit/CMakeLists.txt +++ b/src/operators/ModelFit/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME ModelFit - DEFINES ${ModelFit_DEFINES}) + ONAME ModelFit) diff --git a/src/operators/MultiresControl/CMakeLists.txt b/src/operators/MultiresControl/CMakeLists.txt index d8518ff4ff7..b3637895412 100644 --- a/src/operators/MultiresControl/CMakeLists.txt +++ b/src/operators/MultiresControl/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME MultiresControl - DEFINES ${MultiresControl_DEFINES}) + ONAME MultiresControl) diff --git a/src/operators/OnionPeel/CMakeLists.txt b/src/operators/OnionPeel/CMakeLists.txt index 202364ef02e..227c468b72d 100644 --- a/src/operators/OnionPeel/CMakeLists.txt +++ b/src/operators/OnionPeel/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME OnionPeel - DEFINES ${OnionPeel_DEFINES}) + ONAME OnionPeel) diff --git a/src/operators/PDF/CMakeLists.txt b/src/operators/PDF/CMakeLists.txt index 6a67a6d3545..d97e4840b50 100644 --- a/src/operators/PDF/CMakeLists.txt +++ b/src/operators/PDF/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME PDF - DEFINES ${PDF_DEFINES}) + ONAME PDF) diff --git a/src/operators/PersistentParticles/CMakeLists.txt b/src/operators/PersistentParticles/CMakeLists.txt index 1df62b35106..ba1a6bd2af0 100644 --- a/src/operators/PersistentParticles/CMakeLists.txt +++ b/src/operators/PersistentParticles/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME PersistentParticles - DEFINES ${PersistentParticles_DEFINES}) + ONAME PersistentParticles) diff --git a/src/operators/Poincare/CMakeLists.txt b/src/operators/Poincare/CMakeLists.txt index 99bc9e88363..866f8a93cf1 100644 --- a/src/operators/Poincare/CMakeLists.txt +++ b/src/operators/Poincare/CMakeLists.txt @@ -6,6 +6,5 @@ visit_add_operator_plugin( RationalSurfaceLib.C skelet.C dir_graph.C - DEFINES ${Poincare_DEFINES} ESERLIBS avtivp_ser EPARLIBS avtivp_par) diff --git a/src/operators/Project/CMakeLists.txt b/src/operators/Project/CMakeLists.txt index 74a87f88506..4f49825c2a2 100644 --- a/src/operators/Project/CMakeLists.txt +++ b/src/operators/Project/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME Project - DEFINES ${Project_DEFINES}) + ONAME Project) diff --git a/src/operators/RadialResample/CMakeLists.txt b/src/operators/RadialResample/CMakeLists.txt index 3420ee41090..9e87fc3e96d 100644 --- a/src/operators/RadialResample/CMakeLists.txt +++ b/src/operators/RadialResample/CMakeLists.txt @@ -2,6 +2,5 @@ visit_add_operator_plugin( ONAME RadialResample - DEFINES ${RadialResample_DEFINES} ESERLIBS avtivp_ser EPARLIBS avtivp_par) diff --git a/src/operators/Reflect/CMakeLists.txt b/src/operators/Reflect/CMakeLists.txt index 0ab6c75ecf7..04afe32fe77 100644 --- a/src/operators/Reflect/CMakeLists.txt +++ b/src/operators/Reflect/CMakeLists.txt @@ -2,5 +2,4 @@ visit_add_operator_plugin( ONAME Reflect - GSRC QvisReflectWidget.C - DEFINES ${Reflect_DEFINES}) + GSRC QvisReflectWidget.C) diff --git a/src/operators/Remap/CMakeLists.txt b/src/operators/Remap/CMakeLists.txt index 83dddaa77a2..3f904ecde0a 100644 --- a/src/operators/Remap/CMakeLists.txt +++ b/src/operators/Remap/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME Remap - DEFINES ${Remap_DEFINES}) + ONAME Remap) diff --git a/src/operators/RemoveCells/CMakeLists.txt b/src/operators/RemoveCells/CMakeLists.txt index f12aaab4ada..e3376ca515c 100644 --- a/src/operators/RemoveCells/CMakeLists.txt +++ b/src/operators/RemoveCells/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME RemoveCells - DEFINES ${RemoveCells_DEFINES}) + ONAME RemoveCells) diff --git a/src/operators/Replicate/CMakeLists.txt b/src/operators/Replicate/CMakeLists.txt index 5cedd751425..75c60ba47c8 100644 --- a/src/operators/Replicate/CMakeLists.txt +++ b/src/operators/Replicate/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME Replicate - DEFINES ${Replicate_DEFINES}) + ONAME Replicate) diff --git a/src/operators/Resample/CMakeLists.txt b/src/operators/Resample/CMakeLists.txt index 99e86300854..d52eed6165f 100644 --- a/src/operators/Resample/CMakeLists.txt +++ b/src/operators/Resample/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME Resample - DEFINES ${Resample_DEFINES}) + ONAME Resample) diff --git a/src/operators/Revolve/CMakeLists.txt b/src/operators/Revolve/CMakeLists.txt index 661211aa005..1ec2ca908a3 100644 --- a/src/operators/Revolve/CMakeLists.txt +++ b/src/operators/Revolve/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME Revolve - DEFINES ${Revolve_DEFINES}) + ONAME Revolve) diff --git a/src/operators/SPHResample/CMakeLists.txt b/src/operators/SPHResample/CMakeLists.txt index 44895eeb856..e51bcf58a48 100644 --- a/src/operators/SPHResample/CMakeLists.txt +++ b/src/operators/SPHResample/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME SPHResample - DEFINES ${SPHResample_DEFINES}) + ONAME SPHResample) diff --git a/src/operators/Slice/CMakeLists.txt b/src/operators/Slice/CMakeLists.txt index d56c69c71bb..2ddcc0114a2 100644 --- a/src/operators/Slice/CMakeLists.txt +++ b/src/operators/Slice/CMakeLists.txt @@ -1,16 +1,10 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -visit_add_operator_plugin( - ONAME Slice - DEFINES ${Slice_DEFINES}) - - -if(HAVES_LIBVTKM) - target_link_libraries(ESliceOperator_ser PUBLIC vtkm_cont vtkm_filter_core vtkm_filter_contour vtkm_worklet vtkm_filter_vector_analysis) - - if(VISIT_PARALLEL) - target_link_libraries(ESliceOperator_par PUBLIC vtkm_cont vtkm_filter_core vtkm_filter_contour vtkm_worklet vtkm_filter_vector_analysis) - endif() +if(HAVE_LIBVTKM) + set(Slice_ELibs vtkm_cont vtkm_filter_core vtkm_filter_contour vtkm_worklet vtkm_filter_vector_analysis) endif() - +visit_add_operator_plugin( + ONAME Slice + ESERLIBS ${Slice_ELibs} + EPARLIBS ${Slice_ELibs}) diff --git a/src/operators/Slice/SliceAttributes.code b/src/operators/Slice/SliceAttributes.code index 982ba1cd6ff..5179c801b1c 100644 --- a/src/operators/Slice/SliceAttributes.code +++ b/src/operators/Slice/SliceAttributes.code @@ -393,12 +393,6 @@ SliceAttributes::SetValue(const std::string &name, const bool &value) } Target: xml2cmake -Verbatim: Post -if(HAVES_LIBVTKM) - target_link_libraries(ESliceOperator_ser PUBLIC vtkm_cont vtkm_filter_core vtkm_filter_contour vtkm_worklet vtkm_filter_vector_analysis) - - if(VISIT_PARALLEL) - target_link_libraries(ESliceOperator_par PUBLIC vtkm_cont vtkm_filter_core vtkm_filter_contour vtkm_worklet vtkm_filter_vector_analysis) - endif() -endif() +Condition: HAVE_LIBVTKM +ELinkLibraries: vtkm_cont vtkm_filter_core vtkm_filter_contour vtkm_worklet vtkm_filter_vector_analysis diff --git a/src/operators/Smooth/CMakeLists.txt b/src/operators/Smooth/CMakeLists.txt index 4c0409f05d8..b0fe492efbd 100644 --- a/src/operators/Smooth/CMakeLists.txt +++ b/src/operators/Smooth/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME Smooth - DEFINES ${Smooth_DEFINES}) + ONAME Smooth) diff --git a/src/operators/SphereSlice/CMakeLists.txt b/src/operators/SphereSlice/CMakeLists.txt index 761e99d6ce7..ecc1a8f4043 100644 --- a/src/operators/SphereSlice/CMakeLists.txt +++ b/src/operators/SphereSlice/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME SphereSlice - DEFINES ${SphereSlice_DEFINES}) + ONAME SphereSlice) diff --git a/src/operators/Stagger/CMakeLists.txt b/src/operators/Stagger/CMakeLists.txt index cb7fd5a09a2..1e3638e4dc5 100644 --- a/src/operators/Stagger/CMakeLists.txt +++ b/src/operators/Stagger/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME Stagger - DEFINES ${Stagger_DEFINES}) + ONAME Stagger) diff --git a/src/operators/StatisticalTrends/CMakeLists.txt b/src/operators/StatisticalTrends/CMakeLists.txt index 0f35836dc6f..2c52b4f1fdf 100644 --- a/src/operators/StatisticalTrends/CMakeLists.txt +++ b/src/operators/StatisticalTrends/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME StatisticalTrends - DEFINES ${StatisticalTrends_DEFINES}) + ONAME StatisticalTrends) diff --git a/src/operators/SubdivideQuads/CMakeLists.txt b/src/operators/SubdivideQuads/CMakeLists.txt index c3b29e7b484..23ca7158114 100644 --- a/src/operators/SubdivideQuads/CMakeLists.txt +++ b/src/operators/SubdivideQuads/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME SubdivideQuads - DEFINES ${SubdivideQuads_DEFINES}) + ONAME SubdivideQuads) diff --git a/src/operators/SurfCompPrep/CMakeLists.txt b/src/operators/SurfCompPrep/CMakeLists.txt index bae385ca1d4..01463955ee7 100644 --- a/src/operators/SurfCompPrep/CMakeLists.txt +++ b/src/operators/SurfCompPrep/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME SurfCompPrep - DEFINES ${SurfCompPrep_DEFINES}) + ONAME SurfCompPrep) diff --git a/src/operators/SurfaceNormal/CMakeLists.txt b/src/operators/SurfaceNormal/CMakeLists.txt index 585fa575894..2da6c725890 100644 --- a/src/operators/SurfaceNormal/CMakeLists.txt +++ b/src/operators/SurfaceNormal/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME SurfaceNormal - DEFINES ${SurfaceNormal_DEFINES}) + ONAME SurfaceNormal) diff --git a/src/operators/Tessellate/CMakeLists.txt b/src/operators/Tessellate/CMakeLists.txt index 1adc072f1bf..fd2adbfe9be 100644 --- a/src/operators/Tessellate/CMakeLists.txt +++ b/src/operators/Tessellate/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME Tessellate - DEFINES ${Tessellate_DEFINES}) + ONAME Tessellate) diff --git a/src/operators/ThreeSlice/CMakeLists.txt b/src/operators/ThreeSlice/CMakeLists.txt index e0d9a7d57fe..51e5c4b5d32 100644 --- a/src/operators/ThreeSlice/CMakeLists.txt +++ b/src/operators/ThreeSlice/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME ThreeSlice - DEFINES ${ThreeSlice_DEFINES}) + ONAME ThreeSlice) diff --git a/src/operators/Threshold/CMakeLists.txt b/src/operators/Threshold/CMakeLists.txt index 1b702581b83..78426f2c080 100644 --- a/src/operators/Threshold/CMakeLists.txt +++ b/src/operators/Threshold/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME Threshold - DEFINES ${Threshold_DEFINES}) + ONAME Threshold) diff --git a/src/operators/ToroidalPoloidalProjection/CMakeLists.txt b/src/operators/ToroidalPoloidalProjection/CMakeLists.txt index 6408badc39e..30e3a995626 100644 --- a/src/operators/ToroidalPoloidalProjection/CMakeLists.txt +++ b/src/operators/ToroidalPoloidalProjection/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME ToroidalPoloidalProjection - DEFINES ${ToroidalPoloidalProjection_DEFINES}) + ONAME ToroidalPoloidalProjection) diff --git a/src/operators/Transform/CMakeLists.txt b/src/operators/Transform/CMakeLists.txt index 0dc9cd810d5..7dff36abe46 100644 --- a/src/operators/Transform/CMakeLists.txt +++ b/src/operators/Transform/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME Transform - DEFINES ${Transform_DEFINES}) + ONAME Transform) diff --git a/src/operators/TriangulateRegularPoints/CMakeLists.txt b/src/operators/TriangulateRegularPoints/CMakeLists.txt index d9cf941f4bf..0026f70b099 100644 --- a/src/operators/TriangulateRegularPoints/CMakeLists.txt +++ b/src/operators/TriangulateRegularPoints/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME TriangulateRegularPoints - DEFINES ${TriangulateRegularPoints_DEFINES}) + ONAME TriangulateRegularPoints) diff --git a/src/operators/Tube/CMakeLists.txt b/src/operators/Tube/CMakeLists.txt index 701b3e15f81..1b76a6e279c 100644 --- a/src/operators/Tube/CMakeLists.txt +++ b/src/operators/Tube/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME Tube - DEFINES ${Tube_DEFINES}) + ONAME Tube) diff --git a/src/operators/ZoneDump/CMakeLists.txt b/src/operators/ZoneDump/CMakeLists.txt index 5079f32a106..ddc9412141d 100644 --- a/src/operators/ZoneDump/CMakeLists.txt +++ b/src/operators/ZoneDump/CMakeLists.txt @@ -1,5 +1,4 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake visit_add_operator_plugin( - ONAME ZoneDump - DEFINES ${ZoneDump_DEFINES}) + ONAME ZoneDump) diff --git a/src/plots/Volume/CMakeLists.txt b/src/plots/Volume/CMakeLists.txt index e78ed7da479..57abfe9da35 100644 --- a/src/plots/Volume/CMakeLists.txt +++ b/src/plots/Volume/CMakeLists.txt @@ -1,14 +1,31 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake + +if(ICET_FOUND) + # We need to link with OpenGL on Mac when we have IceT. + if(APPLE) + set(ICET_OPENGL ${OPENGL_gl_LIBRARY}) + endif() + # Link icet libraries using absolute pathes + set(ICET_FULLPATH_LIB ${ICET_OPENGL}) + foreach(X ${ICET_LIB}) + list(APPEND ICET_FULLPATH_LIB "${ICET_LIBRARY_DIR}/${X}") + endforeach() +endif() + + + set(Volume_DEFINES) if(VISIT_SLIVR) list(APPEND Volume_DEFINES VISIT_SLIVR) endif() - if(ICET_FOUND) list(APPEND Volume_DEFINES HAVE_ICET) endif() +if(ICET_FOUND) + set(Volume_ELibs ${ICET_FULLPATH_LIB}) +endif() visit_add_plot_plugin( PNAME Volume @@ -30,27 +47,9 @@ visit_add_plot_plugin( avtfilters_ser VTK::RenderingVolume VTK::RenderingVolumeOpenGL2 + ${Volume_ELibs} EPARLIBS avtexpressions_par avtfilters_par VTK::RenderingVolume - VTK::RenderingVolumeOpenGL2) - - -if(ICET_FOUND) - # We need to link with OpenGL on Mac when we have IceT. - if(APPLE) - set(ICET_OPENGL ${OPENGL_gl_LIBRARY}) - endif() - # Link icet libraries using absolute pathes - set(ICET_FULLPATH_LIB ${ICET_OPENGL}) - foreach(X ${ICET_LIB}) - list(APPEND ICET_FULLPATH_LIB "${ICET_LIBRARY_DIR}/${X}") - endforeach() - - target_link_libraries(EVolumePlot_ser PUBLIC ${ICET_FULLPATH_LIB}) - if(VISIT_PARALLEL) - target_link_libraries(EVolumePlot_par PUBLIC ${ICET_FULLPATH_LIB}) - endif() -endif() - - + VTK::RenderingVolumeOpenGL2 + ${Volume_ELibs}) diff --git a/src/plots/Volume/VolumeAttributes.code b/src/plots/Volume/VolumeAttributes.code index 12b3d4771f3..e4d860890ae 100644 --- a/src/plots/Volume/VolumeAttributes.code +++ b/src/plots/Volume/VolumeAttributes.code @@ -985,7 +985,7 @@ Includes: ${ICET_INCLUDE_DIR} ELinkLibraries: ${ICET_FULLPATH_LIB} Target: xml2cmake -Verbatim: Post +Verbatim: Pre if(ICET_FOUND) # We need to link with OpenGL on Mac when we have IceT. if(APPLE) @@ -996,11 +996,6 @@ if(ICET_FOUND) foreach(X ${ICET_LIB}) list(APPEND ICET_FULLPATH_LIB "${ICET_LIBRARY_DIR}/${X}") endforeach() - - target_link_libraries(EVolumePlot_ser PUBLIC ${ICET_FULLPATH_LIB}) - if(VISIT_PARALLEL) - target_link_libraries(EVolumePlot_par PUBLIC ${ICET_FULLPATH_LIB}) - endif() endif() diff --git a/src/tools/dev/xml/GenerateCMake.h b/src/tools/dev/xml/GenerateCMake.h index 8f35cf706fb..93ebada5737 100644 --- a/src/tools/dev/xml/GenerateCMake.h +++ b/src/tools/dev/xml/GenerateCMake.h @@ -552,43 +552,6 @@ class CMakeGeneratorPlugin : public Plugin } } - void WriteCMake_PlotOperator_Includes(QTextStream &out) - { - // take any ${} from the CXXFLAGS to mean a variable that contains - // include directories. - std::vector extraIncludes; - for (size_t i=0; i 0) - out << ToString(extraIncludes, true); - out << ")" << Endl; - out << Endl; - } - void CMakeAdd_EngineTargets(QTextStream &out) { QString ptype = type; @@ -697,18 +660,54 @@ class CMakeGeneratorPlugin : public Plugin void WriteCMake_PluginLibs(QTextStream &out, const QString component, - const std::vector libs) + const std::vector libs, + const bool hasConditionalLibs) { + if(libs.empty() && !hasConditionalLibs) + return; + out << Endl; QString IOne(" "); - if (component == "V" || component=="G") + QChar c(component[0]); + if (c == 'V' || c =='G') IOne += QString(" "); - out << " " << component << "LIBS" << IOne << libs[0]; - for(size_t i = 1; i < libs.size(); ++i) - out << Endl << " " << libs[i]; + out << " " << component << "LIBS" << IOne; + if(!libs.empty()) + { + out << libs[0]; + for(size_t i = 1; i < libs.size(); ++i) + out << Endl << " " << libs[i]; + } + if(hasConditionalLibs) + { + if(!libs.empty()) + out << Endl << " "; + out << "${" << name << "_" << c << "Libs}"; + } + } + + bool WriteCMake_PluginConditionalLibs(QTextStream &out, const char *libType) + { + QString c(libType); + c += "LinkLibraries:"; + QStringList conditions, links; + if (GetCondition(c, conditions, links)) + { + out << Endl; + for (int i = 0; i < conditions.size(); ++i) + { + QString libs; + FilterConditionalLibs(links[i], libs); + out << "if(" << conditions[i] << ")" << Endl; + out << " set(" << name << "_" << libType << "Libs " << libs << ")" << Endl; + out << "endif()" << Endl; + } + return true; + } + return false; } - void WriteCMake_PluginConditionalDefinitions(QTextStream &out) + bool WriteCMake_PluginConditionalDefinitions(QTextStream &out) { QStringList conditions, defs; if(GetCondition("Definitions:", conditions, defs)) @@ -721,9 +720,10 @@ class CMakeGeneratorPlugin : public Plugin out << " list(APPEND " << name << "_DEFINES " << defs[i]; out << ")" << Endl; out << "endif()" << Endl; - out << Endl; } + return true; } + return false; } void WriteCMake_PluginVerbatim(QTextStream &out, QString prepost) @@ -746,7 +746,10 @@ class CMakeGeneratorPlugin : public Plugin const QString &viewerlibname) { WriteCMake_PluginVerbatim(out, "Pre"); - WriteCMake_PluginConditionalDefinitions(out); + bool hasDefines = WriteCMake_PluginConditionalDefinitions(out); + bool hasGLibs = WriteCMake_PluginConditionalLibs(out, "G"); + bool hasVLibs = WriteCMake_PluginConditionalLibs(out, "V"); + bool hasELibs = WriteCMake_PluginConditionalLibs(out, "E"); out << Endl; if (type == "plot") { @@ -771,307 +774,26 @@ class CMakeGeneratorPlugin : public Plugin WriteCMake_PluginSources(out, "E", efiles); } - out << "\n DEFINES ${" << name << "_DEFINES}"; - - // gui libs - if (!glibs.empty()) + if(hasDefines) { - WriteCMake_PluginLibs(out, "G", glibs); + out << "\n DEFINES ${" << name << "_DEFINES}"; } + // gui libs + WriteCMake_PluginLibs(out, "G", glibs, hasGLibs); + // viewer libs - if (!vlibs.empty()) - { - WriteCMake_PluginLibs(out, "V", vlibs); - } - // engine libs - if (!elibsSer.empty()) - { - WriteCMake_PluginLibs(out, "ESER", elibsSer); - } + WriteCMake_PluginLibs(out, "V", vlibs, hasVLibs); - if (!elibsPar.empty()) - { - WriteCMake_PluginLibs(out, "EPAR", elibsPar); - } + // engine libs + WriteCMake_PluginLibs(out, "ESER", elibsSer, hasELibs); + WriteCMake_PluginLibs(out, "EPAR", elibsPar, hasELibs); out << ")" << Endl; WriteCMake_PluginVerbatim(out, "Post"); } - void WriteCMake_PlotOperatorOLD(QTextStream &out, - const QString &guilibname, - const QString &viewerlibname) - { - bool useFortran = false; - - out << "PROJECT(" << name<< "_" << type << ")" << Endl; - out << Endl; - if (using_dev) - { - out << "ADD_" << type.toUpper() << "_CODE_GEN_TARGETS(" << name << ")" << Endl; - out << Endl; - } - out << "SET(COMMON_SOURCES" << Endl; - out << name << "PluginInfo.C" << Endl; - out << name << "CommonPluginInfo.C" << Endl; - out << atts->name << ".C" << Endl; - out << ")" << Endl; - out << Endl; - out << "SET(LIBI_SOURCES" << Endl; - out << name << "PluginInfo.C" << Endl; - out << ")" << Endl; - out << Endl; - WriteCMake_ConditionalSources(out, "I", ""); - - // libG sources - out << "SET(LIBG_SOURCES" << Endl; - out << name << "GUIPluginInfo.C" << Endl; - out << "Qvis" << name; - if (type == "plot") - out << "PlotWindow.C" << Endl; - else - out << "Window.C" << Endl; - out << "${COMMON_SOURCES}" << Endl; - if (customgfiles) - { - useFortran |= CustomFilesUseFortran(gfiles); - for (size_t i=0; i linkDirs; - linkDirs.push_back("${VISIT_LIBRARY_DIR}"); - if (!using_dev) - { - linkDirs.push_back("${VISIT_ARCHIVE_DIR}"); - } - // Extract extra link directories from LDFLAGS if they have ${},$(),-L - for (size_t i=0; iname<<".C" << Endl; - if (customsfiles) - for (size_t i=0; iname<<".java DESTINATION ${JavaClient_BINARY_DIR}/src/" << type << "s)" << Endl; - out << " ADD_CUSTOM_TARGET(Java"<name<<".java" << Endl; - out << " DEPENDS JavaClient" << Endl; - out << " WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})" << Endl; - out << " ENDIF(VISIT_JAVA)" << Endl; - - out << "ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)" << Endl; - out << Endl; - - CMakeAdd_EngineTargets(out); - - out << "VISIT_INSTALL_" << type.toUpper() << "_PLUGINS(${INSTALLTARGETS})" << Endl; - - if (using_dev) - { - out << "VISIT_PLUGIN_TARGET_OUTPUT_DIR(" << type << "s ${INSTALLTARGETS})" << Endl; - out << "VISIT_PLUGIN_TARGET_FOLDER(" << type << "s " << name - << " ${INSTALLTARGETS})" << Endl; - } - out << Endl; -#ifdef _WIN32 - if (!using_dev) - { - out << "MESSAGE(STATUS \"Plugin will be installed to: ${VISIT_PLUGIN_DIR}\")" << Endl; - } -#endif - } - void WriteCMake_Database(QTextStream &out) { bool useFortran = false; From aef38e743f7f552d34030ae47e130360f8b62a37 Mon Sep 17 00:00:00 2001 From: biagas Date: Tue, 11 Feb 2025 14:28:37 -0800 Subject: [PATCH 3/3] Add support for conditional includes in GenerateCMake for new operator plugin logic. Rerun xml2cmake for VolumePlot to get updates to includes. Fix compilation for visitpy/mpicom. --- src/plots/Volume/CMakeLists.txt | 5 +++++ src/tools/dev/xml/GenerateCMake.h | 22 ++++++++++++++++++++++ src/visitpy/mpicom/CMakeLists.txt | 1 + 3 files changed, 28 insertions(+) diff --git a/src/plots/Volume/CMakeLists.txt b/src/plots/Volume/CMakeLists.txt index 57abfe9da35..b39247f070b 100644 --- a/src/plots/Volume/CMakeLists.txt +++ b/src/plots/Volume/CMakeLists.txt @@ -23,6 +23,10 @@ if(ICET_FOUND) list(APPEND Volume_DEFINES HAVE_ICET) endif() +if(ICET_FOUND) + set(Volume_INCLUDES ${ICET_INCLUDE_DIR}) +endif() + if(ICET_FOUND) set(Volume_ELibs ${ICET_FULLPATH_LIB}) endif() @@ -41,6 +45,7 @@ visit_add_plot_plugin( avtICETCompositor.C avtVolumeResampleFilter.C DEFINES ${Volume_DEFINES} + INCLUDES ${Volume_INCLUDES} VLIBS VTK::RenderingVolume VTK::RenderingVolumeOpenGL2 ESERLIBS avtexpressions_ser diff --git a/src/tools/dev/xml/GenerateCMake.h b/src/tools/dev/xml/GenerateCMake.h index 93ebada5737..6b4ff25ffa8 100644 --- a/src/tools/dev/xml/GenerateCMake.h +++ b/src/tools/dev/xml/GenerateCMake.h @@ -707,6 +707,23 @@ class CMakeGeneratorPlugin : public Plugin return false; } + bool WriteCMake_PluginConditionalIncludes(QTextStream &out) + { + QStringList conditions, incs; + if(GetCondition("Includes:", conditions, incs)) + { + out << Endl; + for (int i = 0; i < conditions.size(); ++i) + { + out << "if(" << conditions[i] << ")" << Endl; + out << " set(" << name << "_INCLUDES " << incs[i] << ")" << Endl; + out << "endif()" << Endl; + } + return true; + } + return false; + } + bool WriteCMake_PluginConditionalDefinitions(QTextStream &out) { QStringList conditions, defs; @@ -747,6 +764,7 @@ class CMakeGeneratorPlugin : public Plugin { WriteCMake_PluginVerbatim(out, "Pre"); bool hasDefines = WriteCMake_PluginConditionalDefinitions(out); + bool hasIncludes = WriteCMake_PluginConditionalIncludes(out); bool hasGLibs = WriteCMake_PluginConditionalLibs(out, "G"); bool hasVLibs = WriteCMake_PluginConditionalLibs(out, "V"); bool hasELibs = WriteCMake_PluginConditionalLibs(out, "E"); @@ -778,6 +796,10 @@ class CMakeGeneratorPlugin : public Plugin { out << "\n DEFINES ${" << name << "_DEFINES}"; } + if(hasIncludes) + { + out << "\n INCLUDES ${" << name << "_INCLUDES}"; + } // gui libs WriteCMake_PluginLibs(out, "G", glibs, hasGLibs); diff --git a/src/visitpy/mpicom/CMakeLists.txt b/src/visitpy/mpicom/CMakeLists.txt index c71134e1aef..574dff1b78c 100644 --- a/src/visitpy/mpicom/CMakeLists.txt +++ b/src/visitpy/mpicom/CMakeLists.txt @@ -32,6 +32,7 @@ IF(VISIT_PARALLEL) src/Buffer.C) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src/ + ${VISIT_SOURCE_DIR}/visitpy/common ${PYTHON_INCLUDE_PATH}) LINK_DIRECTORIES(${LIBRARY_OUTPUT_DIRECTORY})