Commit 8eb6c455 authored by Keith Bennett's avatar Keith Bennett

Merge branch 'hotfix/1.5.8'

parents ee5794ac 2bc352af
<?xml version="1.0"?>
<Plugin name="SDF" type="database" label="Self Describing Format"
version="1.5.7" enabled="true" mdspecificcode="false"
version="1.5.8" 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.7" enabled="true" mdspecificcode="false"
version="1.5.8" enabled="true" mdspecificcode="false"
engspecificcode="false" onlyengine="false" noengine="false" dbtype="STMD"
haswriter="false" hasoptions="true" filePatternsStrict="false"
opensWholeDirectory="false">
......
......@@ -189,11 +189,13 @@ CC=mpicc," Makefile > .Makefile.tmp
base=`basename $f`
com1=vtkCommonDataModel
com2=vtkCommonExecutionModel
sed 's/\([;"]'$com1'-\)\([^;]*\)/\1\2;'$com2'-\2/' \
sed 's/\([;"]'$com1'-\)\([^;]*\)/\1\2;'$com2'-\2/;
s,/Users/miller86/[^;]*;,,g' \
$f > $tmpdir/$base
if [ $build_type -eq 2 ]; then
sed 's/\([;"]\)[^;]*libmpi[^;]*;/\1/g;
s/\([;"]\)[^;]*libopen-[^;]*;/\1/g;
s,/Users/miller86/[^;]*;,,g;
s/\([;"]\)[^;]*general[^;]*;/\1/g' $f > $tmpdir/$base
grep -v 'CMAKE_CXX_COMPILER ' $tmpdir/$base | \
grep -v 'CMAKE_C_COMPILER ' | \
......@@ -202,6 +204,7 @@ CC=mpicc," Makefile > .Makefile.tmp
elif [ $build_type -eq 3 ]; then
sed 's/\([;"]\)[^;]*libmpi[^;]*;/\1/g;
s/\([;"]\)[^;]*libopen-[^;]*;/\1/g;
s,/Users/miller86/[^;]*;,,g;
s/\([;"]\)[^;]*general[^;]*;/\1/g' $f > $tmpdir/$base
grep -v 'VISIT_PARALLEL ' $tmpdir/$base > $tmpdir/tmp
mv $tmpdir/tmp $tmpdir/$base
......
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