Commit 7e9a32f2 authored by fogal1's avatar fogal1
Browse files

Minor build updates.

Mostly re-adding OpenSSL and XML to Qt.

commit 8a656e46d0a66e4c686f2c085c2d7d21d219a3c7
Author: Tom Fogal <tfogal@alumni.unh.edu>
Date:   Thu Jan 21 20:30:11 2010 -0700

    Re-add OpenSSL, it's used directly.

    i.e. not through the QtNetwork lib.  We use it for the auto-update
    feature.

commit a73ba694bebf8ea77bd4ea3623d03eb8f81ef1ec
Author: Tom Fogal <tfogal@alumni.unh.edu>
Date:   Wed Jan 20 23:04:05 2010 -0700

    Link in GLEW.

    Needed for GLSL code, etc.

commit 250e5e73e07bd11322fb56611aab846897530fcf
Author: Tom Fogal <tfogal@alumni.unh.edu>
Date:   Wed Jan 20 22:59:02 2010 -0700

    Re-add QtXml to the list of Mac frameworks.

    We're not using the XMLPatterns library, which I disabled in an
    earlier commit, but we are still using QtXml.  QtXml was still
    being built (doesn't seem like we can turn it off in 4.4.3?), just
    not being copied / fixed as a Mac framework.

Author: Tom Fogal <tfogal@alumni.unh.edu>
Date:   Wed Jan 20 14:20:52 2010 -0700

    Delete shader logs.

    Fixes a per-shader memory leak, on some cards (particularly ATI).

commit 35a5c30cd4c2b848f282cb547188702ac4bc58d3
Author: Tom Fogal <tfogal@alumni.unh.edu>
Date:   Wed Jan 20 14:19:41 2010 -0700

    Formatting, bail if program creation fails.

commit dd8bf5c6e27f55d2f0dcd64181173360fe96724a
Author: Tom Fogal <tfogal@alumni.unh.edu>
Date:   Wed Jan 20 14:19:11 2010 -0700

    Add GLEW to includes.

    Fixes build of Streamline filter.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@9616 18c085ea-50e0-402c-830e-de6fd14e8384
parent e9162eca
......@@ -100,7 +100,7 @@ IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO
TARGET_LINK_LIBRARIES(GStreamlinePlot visitcommon gui )
ADD_LIBRARY(VStreamlinePlot ${LIBV_SOURCES})
TARGET_LINK_LIBRARIES(VStreamlinePlot visitcommon viewer )
TARGET_LINK_LIBRARIES(VStreamlinePlot visitcommon viewer ${GLEW_LIB} )
SET(INSTALLTARGETS ${INSTALLTARGETS} GStreamlinePlot VStreamlinePlot)
IF(VISIT_PYTHON_SCRIPTING)
......@@ -121,13 +121,13 @@ IF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO
ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_DBIO_ONLY)
ADD_LIBRARY(EStreamlinePlot_ser ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EStreamlinePlot_ser visitcommon avtplotter_ser avtpipeline_ser )
TARGET_LINK_LIBRARIES(EStreamlinePlot_ser visitcommon avtplotter_ser avtpipeline_ser ${GLEW_LIB} )
SET(INSTALLTARGETS ${INSTALLTARGETS} EStreamlinePlot_ser)
ADD_TARGET_DEFINITIONS(EStreamlinePlot_ser ENGINE)
IF(VISIT_PARALLEL)
ADD_PARALLEL_LIBRARY(EStreamlinePlot_par ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(EStreamlinePlot_par visitcommon avtplotter_par avtpipeline_par )
TARGET_LINK_LIBRARIES(EStreamlinePlot_par visitcommon avtplotter_par avtpipeline_par ${GLEW_LIB} )
SET(INSTALLTARGETS ${INSTALLTARGETS} EStreamlinePlot_par)
ADD_TARGET_DEFINITIONS(EStreamlinePlot_par ENGINE)
ENDIF(VISIT_PARALLEL)
......
......@@ -3,6 +3,15 @@
<CXXFLAGS>
${GLEW_INCLUDE_DIR}
</CXXFLAGS>
<LIBS components="V">
${GLEW_LIB}
</LIBS>
<LIBS components="ESer">
${GLEW_LIB}
</LIBS>
<LIBS components="EPar">
${GLEW_LIB}
</LIBS>
<Files components="V">
avtStreamlineRenderer.C
avtMesaStreamlineRenderer.C
......
......@@ -777,6 +777,12 @@
# Tom Fogal, Wed Jan 13 19:53:25 MST 2010
# Get rid of OpenSSL too; we're not using QtNetwork.
#
# Tom Fogal, Wed Jan 20 22:58:41 MST 2010
# Re-add QtXml to the list of Mac frameworks.
#
# Tom Fogal, Thu Jan 21 20:27:37 MST 2010
# Re-add OpenSSL, it's used directly (not through QtNetwork!).
#
# *****************************************************************************
# #
# *************************************************************************** #
......@@ -2902,7 +2908,6 @@ function build_qt
qt_flags="${qt_flags} -no-xmlpatterns"
#qt_flags="${qt_flags} -no-scripttools" # disable for now -- not in 4.4.3
qt_flags="${qt_flags} -no-webkit"
qt_flags="${qt_flags} -no-openssl"
info "Configuring Qt4: ./configure --prefix=${VISITDIR}/qt/${QT_VERSION}/${VISITARCH}/" \
"-platform ${QT_PLATFORM}" \
"-make libs -make tools -fast -no-separate-debug-info" \
......@@ -2957,7 +2962,7 @@ function build_qt
for f in *.a; do ln -s $f ${f%\.*}.so; done
elif [[ "$DO_STATIC_BUILD" == "no" && "$OPSYS" == "Darwin" && $ABS_PATH == "no" ]]; then
QtTopDir="${VISITDIR}/qt/${QT_VERSION}/${VISITARCH}"
QtFrameworks="QtCore QtGui QtNetwork QtOpenGL QtScript QtSvg"
QtFrameworks="QtCore QtGui QtNetwork QtOpenGL QtScript QtSvg QtXml"
for QtFW in $QtFrameworks; do
filename="$QtTopDir/lib/${QtFW}.framework/${QtFW}"
debugFilename="${filename}_debug"
......
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