Commit cc8efb30 authored by js9's avatar js9

Moving verdict code into its own library so it can

be re-used other places in VisIt.



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@6263 18c085ea-50e0-402c-830e-de6fd14e8384
parent a43dcda9
......@@ -232,6 +232,9 @@
# Hank Childs, Mon Dec 29 11:52:35 PST 2008
# Added avtDominantMaterialExpression.
#
# Jeremy Meredith, Wed Feb 11 16:39:34 EST 2009
# Removed verdict-related stuff from MeshQuality into new third_party lib.
#
##############################################################################
@SET_MAKE@
......@@ -423,18 +426,7 @@ MeshQuality_src= \
MeshQuality/avtVMetricTaper.C \
MeshQuality/avtVMetricVolume.C \
MeshQuality/avtVMetricWarpage.C \
MeshQuality/avtVerdictExpression.C \
MeshQuality/V_EdgeMetric.C \
MeshQuality/V_GaussIntegration.C \
MeshQuality/V_HexMetric.C \
MeshQuality/V_KnifeMetric.C \
MeshQuality/V_PyramidMetric.C \
MeshQuality/V_QuadMetric.C \
MeshQuality/V_TetMetric.C \
MeshQuality/V_TriMetric.C \
MeshQuality/V_WedgeMetric.C \
MeshQuality/VerdictVector.C
MeshQuality/avtVerdictExpression.C
CPPFLAGS=@COMPONENT_CPPFLAGS@ @CPPFLAGS@
......@@ -443,7 +435,7 @@ PAROBJ=$(SRC:.C=_par.o)
LIB=libexpressions
SERLIBS_FOR_MACOSX_PREBINDING=$(MESA_LIBS) $(ZLIB_LIB) $(GLEW_LIBS) -lavtfilters_ser -lavtddf_ser
PARLIBS_FOR_MACOSX_PREBINDING=$(MESA_LIBS) $(ZLIB_LIB) $(GLEW_LIBS) -lavtfilters_par -lavtddf_par
COMMONLIBS=-ldbatts -lavtexceptions -lstate -lcomm -lmisc -lexpr -lparser -lutility -lplugin -lvisit_vtk -lrendering_visit_vtk -llightweight_visit_vtk -lavtview
COMMONLIBS=-ldbatts -lavtexceptions -lstate -lcomm -lmisc -lexpr -lparser -lutility -lplugin -lvisit_vtk -lrendering_visit_vtk -llightweight_visit_vtk -lavtview -lvisit_verdict
SERLIBS=$(COMMONLIBS) -lpipeline_ser -lavtmath_ser -ldatabase_ser -lmir_ser $(VTK_LIBS) $(SERLIBS_FOR_MACOSX_PREBINDING) $(X_LIBS) @LIBS@
PARLIBS=$(COMMONLIBS) -lpipeline_par -lavtmath_par -ldatabase_par -lmir_par $(VTK_LIBS) $(PARLIBS_FOR_MACOSX_PREBINDING) $(X_LIBS) @LIBS@ @SHLIB_MPI_LIBS@
......
......@@ -19909,7 +19909,8 @@ THIRD_PARTY_BUILTIN_FILES="third_party_builtin/Makefile
third_party_builtin/slivr/teem/Makefile
third_party_builtin/bow/Makefile
third_party_builtin/cognomen/Makefile
third_party_builtin/Tuvok/Makefile"
third_party_builtin/Tuvok/Makefile
third_party_builtin/verdict/Makefile"
if test "$enable_scripting" = "yes"; then
VISITPY_FILES="visitpy/Makefile
......
......@@ -4053,7 +4053,8 @@ THIRD_PARTY_BUILTIN_FILES="third_party_builtin/Makefile
third_party_builtin/slivr/teem/Makefile
third_party_builtin/bow/Makefile
third_party_builtin/cognomen/Makefile
third_party_builtin/Tuvok/Makefile"
third_party_builtin/Tuvok/Makefile
third_party_builtin/verdict/Makefile"
if test "$enable_scripting" = "yes"; then
VISITPY_FILES="visitpy/Makefile
......
......@@ -282,6 +282,10 @@
# Mark C. Miller, Tue Jan 27 18:03:23 PST 2009
# Removed refs to $(FILIB) which was for the FAST INTERVAL LIBRARY and
# was replaced by some Boost builtin libs.
#
# Jeremy Meredith, Wed Feb 11 16:38:42 EST 2009
# Added link to visit_verdict library.
#
##############################################################################
##
......@@ -300,7 +304,7 @@ CPPFLAGS= -I@tmpinc@ @ENGINE_CPPFLAGS@ @PLATFORM_CPPFLAGS@ @CPPFLAGS@ \
COMMONLIBS=-L../../lib -lplugin -lavtview \
-lvisit_vtk -lrendering_visit_vtk -llightweight_visit_vtk \
-lenginerpc -lutility -lmisc -lcomm -lstate \
-ldbatts -lavtexceptions -lexpr -lexpr -lparser \
-ldbatts -lavtexceptions -lexpr -lexpr -lparser -lvisit_verdict \
$(VISIT_VTK_LDFLAGS)
SERLIBS=$(COMMONLIBS) -lviswindow_ser -lplotter_ser -lmir_ser -lavtwriter_ser \
......
../../avt/Expressions/MeshQuality/verdict.h
\ No newline at end of file
../../third_party_builtin/verdict/verdict.h
\ No newline at end of file
......@@ -54,6 +54,9 @@
# Tom Fogal, Sun Jul 27 13:33:23 EDT 2008
# Added cognomen.
#
# Jeremy Meredith, Wed Feb 11 16:39:58 EST 2009
# Added verdict.
#
##############################################################################
@SET_MAKE@
......@@ -61,8 +64,8 @@
@DIRTARGETS@
SUBDIRS=@BUILD_MESA_STUB@ @BUILD_ZLIB@ @BUILD_GLEW@ @BUILD_BILIB@ \
@BUILD_SLIVR@ @BUILD_COGNOMEN@ @BUILD_TUVOK@ bow
ALLSUBDIRS=mesa_stub zlib glew bilib slivr bow cognomen Tuvok
@BUILD_SLIVR@ @BUILD_COGNOMEN@ @BUILD_TUVOK@ bow verdict
ALLSUBDIRS=mesa_stub zlib glew bilib slivr bow cognomen Tuvok verdict
message:
@echo
......
......@@ -92,8 +92,8 @@
CPPFLAGS=-I. -I../../include -I../../include/visit
SERLIBS=-L../../lib -ldatabase_ser -lpipeline_ser -lexpressions_ser -lplotter_ser -lparallel_visit_vtk_ser -lavtfilters_ser -lavtview -lavtddf_ser -lexpr -lparser -lvisit_vtk -lrendering_visit_vtk -llightweight_visit_vtk -lutility -lmisc -lcomm -lstate -ldbatts -lavtmath_ser -lavtivp_ser -lavtexceptions -lmir_ser -lplugin @VTK_LIBS@ $(MESA_LIBS) $(GL_LIBS) $(X_LIBS) $(ZLIB_LIB) $(GLEW_LIBS) $(VISIT_VTK_LDFLAGS) @LIBS@ @PTHREAD_LIB@
PARLIBS=-L../../lib -ldatabase_par -lpipeline_par -lexpressions_par -lplotter_par -lparallel_visit_vtk_par -lavtfilters_par -lavtview -lavtddf_par -lexpr -lparser -lvisit_vtk -lrendering_visit_vtk -llightweight_visit_vtk -lutility -lmisc -lcomm -lstate -ldbatts -lavtmath_par -lavtivp_par -lavtexceptions -lmir_par -lplugin @VTK_LIBS@ $(MESA_LIBS) $(GL_LIBS) $(X_LIBS) $(ZLIB_LIB) $(GLEW_LIBS) $(VISIT_VTK_LDFLAGS) @LIBS@ @MPI_LIBS@ @PTHREAD_LIB@
SERLIBS=-L../../lib -ldatabase_ser -lpipeline_ser -lexpressions_ser -lplotter_ser -lparallel_visit_vtk_ser -lavtfilters_ser -lavtview -lavtddf_ser -lexpr -lparser -lvisit_vtk -lrendering_visit_vtk -llightweight_visit_vtk -lvisit_verdict -lutility -lmisc -lcomm -lstate -ldbatts -lavtmath_ser -lavtivp_ser -lavtexceptions -lmir_ser -lplugin @VTK_LIBS@ $(MESA_LIBS) $(GL_LIBS) $(X_LIBS) $(ZLIB_LIB) $(GLEW_LIBS) $(VISIT_VTK_LDFLAGS) @LIBS@ @PTHREAD_LIB@
PARLIBS=-L../../lib -ldatabase_par -lpipeline_par -lexpressions_par -lplotter_par -lparallel_visit_vtk_par -lavtfilters_par -lavtview -lavtddf_par -lexpr -lparser -lvisit_vtk -lrendering_visit_vtk -llightweight_visit_vtk -lvisit_verdict -lutility -lmisc -lcomm -lstate -ldbatts -lavtmath_par -lavtivp_par -lavtexceptions -lmir_par -lplugin @VTK_LIBS@ $(MESA_LIBS) $(GL_LIBS) $(X_LIBS) $(ZLIB_LIB) $(GLEW_LIBS) $(VISIT_VTK_LDFLAGS) @LIBS@ @MPI_LIBS@ @PTHREAD_LIB@
LIBDEP=
##
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment