Commit e5eb29b3 authored by whitlocb's avatar whitlocb

Added --xdb to build_visit and turn on XDB in Windows builds.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@25630 18c085ea-50e0-402c-830e-de6fd14e8384
parent 8c6f8847
...@@ -4,6 +4,7 @@ IF (MSVC_VERSION) ...@@ -4,6 +4,7 @@ IF (MSVC_VERSION)
MESSAGE(STATUS "MSVC_VERSION=${MSVC_VERSION}") MESSAGE(STATUS "MSVC_VERSION=${MSVC_VERSION}")
IF (MSVC11) IF (MSVC11)
SET(VISIT_MSVC_VERSION "MSVC2012") SET(VISIT_MSVC_VERSION "MSVC2012")
VISIT_OPTION_DEFAULT(VISIT_ENABLE_XDB ON)
ELSEIF (MSVC10) ELSEIF (MSVC10)
SET(VISIT_MSVC_VERSION "MSVC2010") SET(VISIT_MSVC_VERSION "MSVC2010")
ELSE() ELSE()
......
...@@ -6,6 +6,7 @@ IF (MSVC_VERSION) ...@@ -6,6 +6,7 @@ IF (MSVC_VERSION)
SET(VISIT_MSVC_VERSION "MSVC2013") SET(VISIT_MSVC_VERSION "MSVC2013")
ELSEIF (MSVC11) ELSEIF (MSVC11)
SET(VISIT_MSVC_VERSION "MSVC2012") SET(VISIT_MSVC_VERSION "MSVC2012")
VISIT_OPTION_DEFAULT(VISIT_ENABLE_XDB ON)
ELSEIF (MSVC10) ELSEIF (MSVC10)
SET(VISIT_MSVC_VERSION "MSVC2010") SET(VISIT_MSVC_VERSION "MSVC2010")
ELSE() ELSE()
......
...@@ -324,6 +324,7 @@ export USE_VISIBILITY_HIDDEN="no" ...@@ -324,6 +324,7 @@ export USE_VISIBILITY_HIDDEN="no"
export VISIT_INSTALL_PREFIX="" export VISIT_INSTALL_PREFIX=""
export VISIT_BUILD_MODE="Release" export VISIT_BUILD_MODE="Release"
export VISIT_SELECTED_DATABASE_PLUGINS="" export VISIT_SELECTED_DATABASE_PLUGINS=""
export DO_XDB="no"
DOWNLOAD_ONLY="no" DOWNLOAD_ONLY="no"
...@@ -964,6 +965,7 @@ for arg in "${arguments[@]}" ; do ...@@ -964,6 +965,7 @@ for arg in "${arguments[@]}" ; do
--thirdparty-path) next_arg="thirdparty-path" --thirdparty-path) next_arg="thirdparty-path"
ON_THIRD_PARTY_PATH="on";; ON_THIRD_PARTY_PATH="on";;
--version) next_arg="version";; --version) next_arg="version";;
--xdb) DO_XDB="yes";;
-4) deprecated="${deprecated} --hdf4";; -4) deprecated="${deprecated} --hdf4";;
-5) deprecated="${deprecated} --hdf5";; -5) deprecated="${deprecated} --hdf5";;
-c) deprecated="${deprecated} --cgns";; -c) deprecated="${deprecated} --cgns";;
......
...@@ -362,6 +362,11 @@ function build_visit ...@@ -362,6 +362,11 @@ function build_visit
FEATURES="${FEATURES} -DVISIT_SERVER_COMPONENTS_ONLY:BOOL=ON" FEATURES="${FEATURES} -DVISIT_SERVER_COMPONENTS_ONLY:BOOL=ON"
fi fi
# Let the user turn on XDB.
if [[ "${DO_XDB}" == "yes" ]] ; then
FEATURES="${FEATURES} -DVISIT_ENABLE_XDB:BOOL=ON"
fi
# Let the user pick a subset of plugins. # Let the user pick a subset of plugins.
if [[ "${VISIT_SELECTED_DATABASE_PLUGINS}" != "" ]] ; then if [[ "${VISIT_SELECTED_DATABASE_PLUGINS}" != "" ]] ; then
FEATURES="${FEATURES} -DVISIT_SELECTED_DATABASE_PLUGINS:STRING=${VISIT_SELECTED_DATABASE_PLUGINS}" FEATURES="${FEATURES} -DVISIT_SELECTED_DATABASE_PLUGINS:STRING=${VISIT_SELECTED_DATABASE_PLUGINS}"
......
...@@ -1530,7 +1530,8 @@ function usage ...@@ -1530,7 +1530,8 @@ function usage
printf "%-15s %s [%s]\n" "--paradis" "Build with the paraDIS client library" "${DO_PARADIS}" printf "%-15s %s [%s]\n" "--paradis" "Build with the paraDIS client library" "${DO_PARADIS}"
printf "%-15s %s [%s]\n" "--static" "Build using static linking" "$DO_STATIC_BUILD" printf "%-15s %s [%s]\n" "--static" "Build using static linking" "$DO_STATIC_BUILD"
printf "%-15s %s [%s]\n" "--stdout" "Write build log to stdout" "$LOG_FILE" printf "%-15s %s [%s]\n" "--stdout" "Write build log to stdout" "$LOG_FILE"
printf "%-15s %s [%s]\n" "--xdb" "Enable FieldView XDB plugin." "$DO_XDB"
for (( bv_i=0; bv_i<${#grouplibs_comment[*]}; ++bv_i )) for (( bv_i=0; bv_i<${#grouplibs_comment[*]}; ++bv_i ))
do do
name=${grouplibs_name[$bv_i]} name=${grouplibs_name[$bv_i]}
......
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