Commit eb47a44c authored by Keith Bennett's avatar Keith Bennett

Merge branch 'release/1.5.12'

parents 0ef22f5f 2d7e2d50
<?xml version="1.0"?>
<Plugin name="SDF" type="database" label="Self Describing Format"
version="1.5.11" enabled="true" mdspecificcode="false"
version="1.5.12" enabled="true" mdspecificcode="false"
engspecificcode="false" onlyengine="false" noengine="false" dbtype="STMD"
haswriter="false" hasoptions="true" filePatternsStrict="false"
opensWholeDirectory="false">
......
<?xml version="1.0"?>
<Plugin name="SDF" type="database" label="Self Describing Format"
version="1.5.11" enabled="true" mdspecificcode="false"
version="1.5.12" enabled="true" mdspecificcode="false"
engspecificcode="false" onlyengine="false" noengine="false" dbtype="STMD"
haswriter="false" hasoptions="true" filePatternsStrict="false"
opensWholeDirectory="false">
......
......@@ -590,6 +590,7 @@ avtSDFFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md)
debug1 << h->dbg_buf; h->dbg = h->dbg_buf; *h->dbg = '\0';
#endif
#ifdef MDSERVER
stack_free(stack_handle);
sdf_close(h);
h = NULL;
#endif
......
......@@ -228,6 +228,15 @@ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON)' CMakeLists.txt > $tmpdir/tmp
CMakeLists.txt > $tmpdir/tmp
mv $tmpdir/tmp CMakeLists.txt
done
# Fixup the cmake file for broken versions of VisIt
if [ $fullversion = "2.7.2." -o $fullversion = "2.7.3." ]; then
setup=$(grep -w PluginVsInstall.cmake CMakeLists.txt | cut -f2 -d\")
sed 's/\(.*GET currentDefs\)/if (currentDefs)\
\1/;
s/\(ENDIF(${firstItem}.*\)/\1\
endif()/' $setup > $tmpdir/tmp
mv $tmpdir/tmp $setup
fi
fi
cmake $DEBUG .
# FIXME: This is to workaround incorrect cmake output
......
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