diff --git a/src/CMake/PluginMacros.cmake b/src/CMake/PluginMacros.cmake index 4dfda0460cc..fae5de6e4f5 100644 --- a/src/CMake/PluginMacros.cmake +++ b/src/CMake/PluginMacros.cmake @@ -445,3 +445,242 @@ function(visit_add_plot_plugin) 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/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..636a2f34ce4 100644 --- a/src/operators/AMRStitchCell/CMakeLists.txt +++ b/src/operators/AMRStitchCell/CMakeLists.txt @@ -1,93 +1,6 @@ # 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) diff --git a/src/operators/AxisAlignedSlice4D/CMakeLists.txt b/src/operators/AxisAlignedSlice4D/CMakeLists.txt index 628e1dca03b..f398d45cf28 100644 --- a/src/operators/AxisAlignedSlice4D/CMakeLists.txt +++ b/src/operators/AxisAlignedSlice4D/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/BoundaryOp/CMakeLists.txt b/src/operators/BoundaryOp/CMakeLists.txt index 33599a29e82..4fe6d3bbde9 100644 --- a/src/operators/BoundaryOp/CMakeLists.txt +++ b/src/operators/BoundaryOp/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/Box/CMakeLists.txt b/src/operators/Box/CMakeLists.txt index c92a0637266..7352a5e0b43 100644 --- a/src/operators/Box/CMakeLists.txt +++ b/src/operators/Box/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/CartographicProjection/CMakeLists.txt b/src/operators/CartographicProjection/CMakeLists.txt index 722fef78579..94099435245 100644 --- a/src/operators/CartographicProjection/CMakeLists.txt +++ b/src/operators/CartographicProjection/CMakeLists.txt @@ -1,96 +1,6 @@ # 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 + ESERLIBS VTK::GeovisCore + EPARLIBS VTK::GeovisCore) diff --git a/src/operators/Clip/CMakeLists.txt b/src/operators/Clip/CMakeLists.txt index bff9b362ae4..1e51dc515e6 100644 --- a/src/operators/Clip/CMakeLists.txt +++ b/src/operators/Clip/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/Cone/CMakeLists.txt b/src/operators/Cone/CMakeLists.txt index ea7ee0a6361..3255694d1e5 100644 --- a/src/operators/Cone/CMakeLists.txt +++ b/src/operators/Cone/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/ConnCompReduce/CMakeLists.txt b/src/operators/ConnCompReduce/CMakeLists.txt index a81985c8d3e..39fbcc9dd87 100644 --- a/src/operators/ConnCompReduce/CMakeLists.txt +++ b/src/operators/ConnCompReduce/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/ConnectedComponents/CMakeLists.txt b/src/operators/ConnectedComponents/CMakeLists.txt index cf347fe8c0e..658efb0011a 100644 --- a/src/operators/ConnectedComponents/CMakeLists.txt +++ b/src/operators/ConnectedComponents/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/Context/CMakeLists.txt b/src/operators/Context/CMakeLists.txt index 4969adb11cb..3b13c2124c8 100644 --- a/src/operators/Context/CMakeLists.txt +++ b/src/operators/Context/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/CoordSwap/CMakeLists.txt b/src/operators/CoordSwap/CMakeLists.txt index d125e884d13..8b643d75efd 100644 --- a/src/operators/CoordSwap/CMakeLists.txt +++ b/src/operators/CoordSwap/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/CracksClipper/CMakeLists.txt b/src/operators/CracksClipper/CMakeLists.txt index 798186217a9..b2295e50099 100644 --- a/src/operators/CracksClipper/CMakeLists.txt +++ b/src/operators/CracksClipper/CMakeLists.txt @@ -1,101 +1,8 @@ # 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) 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..f1b4cd7f682 100644 --- a/src/operators/CreateBonds/CMakeLists.txt +++ b/src/operators/CreateBonds/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/Cylinder/CMakeLists.txt b/src/operators/Cylinder/CMakeLists.txt index bb607d72031..f76b0c173be 100644 --- a/src/operators/Cylinder/CMakeLists.txt +++ b/src/operators/Cylinder/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/DataBinning/CMakeLists.txt b/src/operators/DataBinning/CMakeLists.txt index c623c5b82ae..7e1d455eac3 100644 --- a/src/operators/DataBinning/CMakeLists.txt +++ b/src/operators/DataBinning/CMakeLists.txt @@ -1,91 +1,4 @@ # 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) 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..0624e5ec2ee 100644 --- a/src/operators/Decimate/CMakeLists.txt +++ b/src/operators/Decimate/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/DeferExpression/CMakeLists.txt b/src/operators/DeferExpression/CMakeLists.txt index d5299143022..f8cbb02d8df 100644 --- a/src/operators/DeferExpression/CMakeLists.txt +++ b/src/operators/DeferExpression/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/Delaunay/CMakeLists.txt b/src/operators/Delaunay/CMakeLists.txt index 266a4bf6ab1..54511585496 100644 --- a/src/operators/Delaunay/CMakeLists.txt +++ b/src/operators/Delaunay/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/Displace/CMakeLists.txt b/src/operators/Displace/CMakeLists.txt index 4bc4320b194..d3f0b3d80b1 100644 --- a/src/operators/Displace/CMakeLists.txt +++ b/src/operators/Displace/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) 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..3502280c79a 100644 --- a/src/operators/DualMesh/CMakeLists.txt +++ b/src/operators/DualMesh/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/Edge/CMakeLists.txt b/src/operators/Edge/CMakeLists.txt index ab09fa44860..0d989c013fe 100644 --- a/src/operators/Edge/CMakeLists.txt +++ b/src/operators/Edge/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/Elevate/CMakeLists.txt b/src/operators/Elevate/CMakeLists.txt index 69c9904237c..13a91ac8a6e 100644 --- a/src/operators/Elevate/CMakeLists.txt +++ b/src/operators/Elevate/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/EllipsoidSlice/CMakeLists.txt b/src/operators/EllipsoidSlice/CMakeLists.txt index 205c224a0ef..3b47b026f01 100644 --- a/src/operators/EllipsoidSlice/CMakeLists.txt +++ b/src/operators/EllipsoidSlice/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/Explode/CMakeLists.txt b/src/operators/Explode/CMakeLists.txt index 98cb3049fe7..a1cf8fcc9fa 100644 --- a/src/operators/Explode/CMakeLists.txt +++ b/src/operators/Explode/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/ExternalSurface/CMakeLists.txt b/src/operators/ExternalSurface/CMakeLists.txt index ae3ae295425..25d93410058 100644 --- a/src/operators/ExternalSurface/CMakeLists.txt +++ b/src/operators/ExternalSurface/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/ExtractPointFunction2D/CMakeLists.txt b/src/operators/ExtractPointFunction2D/CMakeLists.txt index e68232c8ffa..91a999451cd 100644 --- a/src/operators/ExtractPointFunction2D/CMakeLists.txt +++ b/src/operators/ExtractPointFunction2D/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/Extrude/CMakeLists.txt b/src/operators/Extrude/CMakeLists.txt index fbe1f61e4bf..c81c9348954 100644 --- a/src/operators/Extrude/CMakeLists.txt +++ b/src/operators/Extrude/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/ExtrudeStacked/CMakeLists.txt b/src/operators/ExtrudeStacked/CMakeLists.txt index b1fb53666f8..d7c43cdff5d 100644 --- a/src/operators/ExtrudeStacked/CMakeLists.txt +++ b/src/operators/ExtrudeStacked/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/FFT/CMakeLists.txt b/src/operators/FFT/CMakeLists.txt index a3fe053d297..3eac258885c 100644 --- a/src/operators/FFT/CMakeLists.txt +++ b/src/operators/FFT/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/FiveFoldTetSubdivision/CMakeLists.txt b/src/operators/FiveFoldTetSubdivision/CMakeLists.txt index 5591bda2ad0..0464aa2c821 100644 --- a/src/operators/FiveFoldTetSubdivision/CMakeLists.txt +++ b/src/operators/FiveFoldTetSubdivision/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/Flux/CMakeLists.txt b/src/operators/Flux/CMakeLists.txt index 6aebd3ffe3d..ad169a3a0ce 100644 --- a/src/operators/Flux/CMakeLists.txt +++ b/src/operators/Flux/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/IndexSelect/CMakeLists.txt b/src/operators/IndexSelect/CMakeLists.txt index f5b0609fd3a..01a305a02bf 100644 --- a/src/operators/IndexSelect/CMakeLists.txt +++ b/src/operators/IndexSelect/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/IntegralCurve/CMakeLists.txt b/src/operators/IntegralCurve/CMakeLists.txt index 572341cc348..6101a178b3e 100644 --- a/src/operators/IntegralCurve/CMakeLists.txt +++ b/src/operators/IntegralCurve/CMakeLists.txt @@ -1,90 +1,6 @@ # 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 + 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..12c76efd8cc 100644 --- a/src/operators/InverseGhostZone/CMakeLists.txt +++ b/src/operators/InverseGhostZone/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/Isosurface/CMakeLists.txt b/src/operators/Isosurface/CMakeLists.txt index 5bac1057b15..fc5ce0ca17b 100644 --- a/src/operators/Isosurface/CMakeLists.txt +++ b/src/operators/Isosurface/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/Isovolume/CMakeLists.txt b/src/operators/Isovolume/CMakeLists.txt index 2cb385b5e6c..b17c30793ca 100644 --- a/src/operators/Isovolume/CMakeLists.txt +++ b/src/operators/Isovolume/CMakeLists.txt @@ -1,99 +1,10 @@ # 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) + set(Isovolume_ELibs 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 + ESERLIBS ${Isovolume_ELibs} + EPARLIBS ${Isovolume_ELibs}) 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..a9898f26d7b 100644 --- a/src/operators/LCS/CMakeLists.txt +++ b/src/operators/LCS/CMakeLists.txt @@ -1,92 +1,8 @@ # 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 + 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..8618ad3250d 100644 --- a/src/operators/Lagrangian/CMakeLists.txt +++ b/src/operators/Lagrangian/CMakeLists.txt @@ -1,90 +1,6 @@ # 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 + ESERLIBS avtivp_ser + EPARLIBS avtivp_par) diff --git a/src/operators/LimitCycle/CMakeLists.txt b/src/operators/LimitCycle/CMakeLists.txt index 89e62f8974f..3c73e2e278b 100644 --- a/src/operators/LimitCycle/CMakeLists.txt +++ b/src/operators/LimitCycle/CMakeLists.txt @@ -1,90 +1,6 @@ # 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 + 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..9c7f9140d18 100644 --- a/src/operators/LineSampler/CMakeLists.txt +++ b/src/operators/LineSampler/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) 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..d0907164718 100644 --- a/src/operators/Lineout/CMakeLists.txt +++ b/src/operators/Lineout/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) 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..b9c4ae1229f 100644 --- a/src/operators/Merge/CMakeLists.txt +++ b/src/operators/Merge/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/MetricThreshold/CMakeLists.txt b/src/operators/MetricThreshold/CMakeLists.txt index 1cb60622f29..1ab143fd7fc 100644 --- a/src/operators/MetricThreshold/CMakeLists.txt +++ b/src/operators/MetricThreshold/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/ModelFit/CMakeLists.txt b/src/operators/ModelFit/CMakeLists.txt index 023d18b5d1b..449db176ee4 100755 --- a/src/operators/ModelFit/CMakeLists.txt +++ b/src/operators/ModelFit/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/MultiresControl/CMakeLists.txt b/src/operators/MultiresControl/CMakeLists.txt index 8e58bbf3859..b3637895412 100644 --- a/src/operators/MultiresControl/CMakeLists.txt +++ b/src/operators/MultiresControl/CMakeLists.txt @@ -1,91 +1,4 @@ # 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) 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..227c468b72d 100644 --- a/src/operators/OnionPeel/CMakeLists.txt +++ b/src/operators/OnionPeel/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/PDF/CMakeLists.txt b/src/operators/PDF/CMakeLists.txt index 38749016c1c..d97e4840b50 100644 --- a/src/operators/PDF/CMakeLists.txt +++ b/src/operators/PDF/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/PersistentParticles/CMakeLists.txt b/src/operators/PersistentParticles/CMakeLists.txt index c80aaeb6a00..ba1a6bd2af0 100644 --- a/src/operators/PersistentParticles/CMakeLists.txt +++ b/src/operators/PersistentParticles/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/Poincare/CMakeLists.txt b/src/operators/Poincare/CMakeLists.txt index bd4c0952a61..866f8a93cf1 100644 --- a/src/operators/Poincare/CMakeLists.txt +++ b/src/operators/Poincare/CMakeLists.txt @@ -1,94 +1,10 @@ # 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 + 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..4f49825c2a2 100644 --- a/src/operators/Project/CMakeLists.txt +++ b/src/operators/Project/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/RadialResample/CMakeLists.txt b/src/operators/RadialResample/CMakeLists.txt index 4068ef98273..9e87fc3e96d 100644 --- a/src/operators/RadialResample/CMakeLists.txt +++ b/src/operators/RadialResample/CMakeLists.txt @@ -1,90 +1,6 @@ # 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 + ESERLIBS avtivp_ser + EPARLIBS avtivp_par) diff --git a/src/operators/Reflect/CMakeLists.txt b/src/operators/Reflect/CMakeLists.txt index 07c3faf55a0..04afe32fe77 100644 --- a/src/operators/Reflect/CMakeLists.txt +++ b/src/operators/Reflect/CMakeLists.txt @@ -1,91 +1,5 @@ # 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) 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..3f904ecde0a 100644 --- a/src/operators/Remap/CMakeLists.txt +++ b/src/operators/Remap/CMakeLists.txt @@ -1,91 +1,4 @@ # 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) 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..e3376ca515c 100644 --- a/src/operators/RemoveCells/CMakeLists.txt +++ b/src/operators/RemoveCells/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/Replicate/CMakeLists.txt b/src/operators/Replicate/CMakeLists.txt index 1c3579431b7..75c60ba47c8 100644 --- a/src/operators/Replicate/CMakeLists.txt +++ b/src/operators/Replicate/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/Resample/CMakeLists.txt b/src/operators/Resample/CMakeLists.txt index ba2b83bb6d2..d52eed6165f 100644 --- a/src/operators/Resample/CMakeLists.txt +++ b/src/operators/Resample/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) 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..1ec2ca908a3 100644 --- a/src/operators/Revolve/CMakeLists.txt +++ b/src/operators/Revolve/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/SPHResample/CMakeLists.txt b/src/operators/SPHResample/CMakeLists.txt index 6a023268687..e51bcf58a48 100644 --- a/src/operators/SPHResample/CMakeLists.txt +++ b/src/operators/SPHResample/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/Slice/CMakeLists.txt b/src/operators/Slice/CMakeLists.txt index 6837b02e72a..2ddcc0114a2 100644 --- a/src/operators/Slice/CMakeLists.txt +++ b/src/operators/Slice/CMakeLists.txt @@ -1,99 +1,10 @@ # DO NOT EDIT THIS FILE! THIS FILE IS AUTOMATICALLY GENERATED BY xml2cmake -PROJECT(Slice_operator) -ADD_OPERATOR_CODE_GEN_TARGETS(Slice) - -SET(COMMON_SOURCES -SlicePluginInfo.C -SliceCommonPluginInfo.C -SliceAttributes.C -) - -SET(LIBI_SOURCES -SlicePluginInfo.C -) - -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) + set(Slice_ELibs 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) - 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}) - +visit_add_operator_plugin( + ONAME Slice + ESERLIBS ${Slice_ELibs} + EPARLIBS ${Slice_ELibs}) 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..5179c801b1c 100644 --- a/src/operators/Slice/SliceAttributes.code +++ b/src/operators/Slice/SliceAttributes.code @@ -393,6 +393,6 @@ 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 +Condition: HAVE_LIBVTKM +ELinkLibraries: vtkm_cont vtkm_filter_core vtkm_filter_contour vtkm_worklet vtkm_filter_vector_analysis 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..b0fe492efbd 100644 --- a/src/operators/Smooth/CMakeLists.txt +++ b/src/operators/Smooth/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/SphereSlice/CMakeLists.txt b/src/operators/SphereSlice/CMakeLists.txt index 2fbf440ab86..ecc1a8f4043 100644 --- a/src/operators/SphereSlice/CMakeLists.txt +++ b/src/operators/SphereSlice/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/Stagger/CMakeLists.txt b/src/operators/Stagger/CMakeLists.txt index 12df71e0fbe..1e3638e4dc5 100644 --- a/src/operators/Stagger/CMakeLists.txt +++ b/src/operators/Stagger/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/StatisticalTrends/CMakeLists.txt b/src/operators/StatisticalTrends/CMakeLists.txt index 85524efeea0..2c52b4f1fdf 100644 --- a/src/operators/StatisticalTrends/CMakeLists.txt +++ b/src/operators/StatisticalTrends/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/SubdivideQuads/CMakeLists.txt b/src/operators/SubdivideQuads/CMakeLists.txt index eff33e69c66..23ca7158114 100644 --- a/src/operators/SubdivideQuads/CMakeLists.txt +++ b/src/operators/SubdivideQuads/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/SurfCompPrep/CMakeLists.txt b/src/operators/SurfCompPrep/CMakeLists.txt index e6eefcfb8d0..01463955ee7 100644 --- a/src/operators/SurfCompPrep/CMakeLists.txt +++ b/src/operators/SurfCompPrep/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/SurfaceNormal/CMakeLists.txt b/src/operators/SurfaceNormal/CMakeLists.txt index bfba9f9f893..2da6c725890 100644 --- a/src/operators/SurfaceNormal/CMakeLists.txt +++ b/src/operators/SurfaceNormal/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/Tessellate/CMakeLists.txt b/src/operators/Tessellate/CMakeLists.txt index e64fd741bef..fd2adbfe9be 100644 --- a/src/operators/Tessellate/CMakeLists.txt +++ b/src/operators/Tessellate/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/ThreeSlice/CMakeLists.txt b/src/operators/ThreeSlice/CMakeLists.txt index b3cd5dfac0b..51e5c4b5d32 100644 --- a/src/operators/ThreeSlice/CMakeLists.txt +++ b/src/operators/ThreeSlice/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/Threshold/CMakeLists.txt b/src/operators/Threshold/CMakeLists.txt index 52770589ad9..78426f2c080 100644 --- a/src/operators/Threshold/CMakeLists.txt +++ b/src/operators/Threshold/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) 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..30e3a995626 100644 --- a/src/operators/ToroidalPoloidalProjection/CMakeLists.txt +++ b/src/operators/ToroidalPoloidalProjection/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/Transform/CMakeLists.txt b/src/operators/Transform/CMakeLists.txt index be617699e16..7dff36abe46 100644 --- a/src/operators/Transform/CMakeLists.txt +++ b/src/operators/Transform/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/TriangulateRegularPoints/CMakeLists.txt b/src/operators/TriangulateRegularPoints/CMakeLists.txt index 3e79ac1ab36..0026f70b099 100644 --- a/src/operators/TriangulateRegularPoints/CMakeLists.txt +++ b/src/operators/TriangulateRegularPoints/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/Tube/CMakeLists.txt b/src/operators/Tube/CMakeLists.txt index 1b658d5048e..1b76a6e279c 100644 --- a/src/operators/Tube/CMakeLists.txt +++ b/src/operators/Tube/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/operators/ZoneDump/CMakeLists.txt b/src/operators/ZoneDump/CMakeLists.txt index 6bc4ed5b9f0..ddc9412141d 100644 --- a/src/operators/ZoneDump/CMakeLists.txt +++ b/src/operators/ZoneDump/CMakeLists.txt @@ -1,90 +1,4 @@ # 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) diff --git a/src/plots/Volume/CMakeLists.txt b/src/plots/Volume/CMakeLists.txt index e78ed7da479..b39247f070b 100644 --- a/src/plots/Volume/CMakeLists.txt +++ b/src/plots/Volume/CMakeLists.txt @@ -1,14 +1,35 @@ # 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_INCLUDES ${ICET_INCLUDE_DIR}) +endif() + +if(ICET_FOUND) + set(Volume_ELibs ${ICET_FULLPATH_LIB}) +endif() visit_add_plot_plugin( PNAME Volume @@ -24,33 +45,16 @@ visit_add_plot_plugin( avtICETCompositor.C avtVolumeResampleFilter.C DEFINES ${Volume_DEFINES} + INCLUDES ${Volume_INCLUDES} VLIBS VTK::RenderingVolume VTK::RenderingVolumeOpenGL2 ESERLIBS avtexpressions_ser 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 d1380740b81..6b4ff25ffa8 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; @@ -685,7 +648,7 @@ class CMakeGeneratorPlugin : public Plugin return false; } - void WriteCMake_PlotSources(QTextStream &out, + void WriteCMake_PluginSources(QTextStream &out, const QString component, const std::vector files) { @@ -695,20 +658,73 @@ class CMakeGeneratorPlugin : public Plugin out << Endl << " " << files[i]; } - void WriteCMake_PlotLibs(QTextStream &out, + 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; + } + + 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; } - void WriteCMake_PlotConditionalDefinitions(QTextStream &out) + bool WriteCMake_PluginConditionalDefinitions(QTextStream &out) { QStringList conditions, defs; if(GetCondition("Definitions:", conditions, defs)) @@ -721,12 +737,13 @@ class CMakeGeneratorPlugin : public Plugin out << " list(APPEND " << name << "_DEFINES " << defs[i]; out << ")" << Endl; out << "endif()" << Endl; - out << Endl; } + return true; } + return false; } - void WriteCMake_PlotVerbatim(QTextStream &out, QString prepost) + void WriteCMake_PluginVerbatim(QTextStream &out, QString prepost) { if (atts != NULL && atts->codeFile != NULL) { @@ -741,327 +758,62 @@ class CMakeGeneratorPlugin : public Plugin } - void WriteCMake_Plot(QTextStream &out, + void WriteCMake_PlotOperator(QTextStream &out, const QString &guilibname, const QString &viewerlibname) { - WriteCMake_PlotVerbatim(out, "Pre"); - WriteCMake_PlotConditionalDefinitions(out); + 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"); out << Endl; - out << "visit_add_plot_plugin(" << Endl; - out << " PNAME " << name; - if (customgfiles) - { - WriteCMake_PlotSources(out, "G", gfiles); - } - if (customvfiles) - { - WriteCMake_PlotSources(out, "V", vfiles); - } - if (customefiles) - { - WriteCMake_PlotSources(out, "E", efiles); - } - - out << "\n DEFINES ${" << name << "_DEFINES}"; - - // gui libs - if (!glibs.empty()) - { - WriteCMake_PlotLibs(out, "G", glibs); - } - - // viewer libs - if (!vlibs.empty()) - { - WriteCMake_PlotLibs(out, "V", vlibs); - } - // engine libs - if (!elibsSer.empty()) - { - WriteCMake_PlotLibs(out, "ESER", elibsSer); - } - - if (!elibsPar.empty()) + if (type == "plot") { - WriteCMake_PlotLibs(out, "EPAR", elibsPar); + out << "visit_add_plot_plugin(" << Endl; + out << " PNAME " << name; } - - out << ")" << Endl; - - WriteCMake_PlotVerbatim(out, "Post"); - } - - void WriteCMake_PlotOperator(QTextStream &out, - const QString &guilibname, - const QString &viewerlibname) - { - bool useFortran = false; - - out << "PROJECT(" << name<< "_" << type << ")" << Endl; - out << Endl; - if (using_dev) + else { - out << "ADD_" << type.toUpper() << "_CODE_GEN_TARGETS(" << name << ")" << Endl; - out << Endl; + out << "visit_add_operator_plugin(" << Endl; + out << " ONAME " << name; } - 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) + if(hasDefines) { - linkDirs.push_back("${VISIT_ARCHIVE_DIR}"); + out << "\n DEFINES ${" << name << "_DEFINES}"; } - // 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 + WriteCMake_PluginVerbatim(out, "Post"); } void WriteCMake_Database(QTextStream &out) @@ -1390,10 +1142,8 @@ class CMakeGeneratorPlugin : public Plugin #endif if(type == "database") WriteCMake_Database(out); - else if(type == "operator") + else WriteCMake_PlotOperator(out, guilibname, viewerlibname); - else if(type == "plot") - WriteCMake_Plot(out, guilibname, viewerlibname); WriteCMake_AdditionalCode(out); } 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 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})