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

Merge branch 'hotfix/1.5.9'

parents 8eb6c455 c51b57dc
Pipeline #812 skipped
<?xml version="1.0"?>
<Plugin name="SDF" type="database" label="Self Describing Format"
version="1.5.8" enabled="true" mdspecificcode="false"
version="1.5.9" 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.8" enabled="true" mdspecificcode="false"
version="1.5.9" enabled="true" mdspecificcode="false"
engspecificcode="false" onlyengine="false" noengine="false" dbtype="STMD"
haswriter="false" hasoptions="true" filePatternsStrict="false"
opensWholeDirectory="false">
......
......@@ -218,7 +218,9 @@ CC=mpicc," Makefile > .Makefile.tmp
# FIXME: This is to workaround incorrect cmake output
ofile=CMakeFiles/ESDFDatabase_par.dir/build.make
if [ -e $ofile ]; then
sed '/linux-x86_64\/lib\/librt\.so/ d;
sed '/lib64\/librt\.so/ d;
/lib64\/libpthread\.so/ d;
/linux-x86_64\/lib\/librt\.so/ d;
/linux-x86_64\/lib\/libpthread\.so/ d' $ofile > $tmpdir/tmp
mv $tmpdir/tmp $ofile
fi
......
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