Commit 3990a7f3 authored by Keith Bennett's avatar Keith Bennett

Fix build script for VisIt-2.13.1 on macOS

The path-mangling ugliness broke yet again.
parent a14741d6
......@@ -209,12 +209,12 @@ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON)' CMakeLists.txt > $tmpdir/tmp
com1=vtkCommonDataModel
com2=vtkCommonExecutionModel
sed 's/\([;"]'$com1'-\)\([^;]*\)/\1\2;'$com2'-\2/;
s,[^; "]*miller86[^;]*/,,g' \
s,[^; "]*/Users[^;]*/,,g' \
$f > $tmpdir/$base
if [ $build_type -eq 2 ]; then
sed 's/\([;"]\)[^;]*libmpi[^;]*;/\1/g;
s/\([;"]\)[^;]*libopen-[^;]*;/\1/g;
s,/Users/miller86/[^;]*;,,g;
s,[^; "]*/Users[^;]*/,,g; \
s/\([;"]\)[^;]*general[^;]*;/\1/g' $f > $tmpdir/$base
grep -v 'CMAKE_CXX_COMPILER ' $tmpdir/$base | \
grep -v 'CMAKE_C_COMPILER ' | \
......@@ -223,7 +223,7 @@ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON)' CMakeLists.txt > $tmpdir/tmp
elif [ $build_type -eq 3 ]; then
sed 's/\([;"]\)[^;]*libmpi[^;]*;/\1/g;
s/\([;"]\)[^;]*libopen-[^;]*;/\1/g;
s,/Users/miller86/[^;]*;,,g;
s,[^; "]*/Users[^;]*/,,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