Commit 11437e2d authored by Keith Bennett's avatar Keith Bennett

Merge branch 'keith/fix_build_script' into 'master'

Fixed a couple of bugs in the VisIt build script

See merge request !10
parents 0789f7b6 f597340c
......@@ -214,7 +214,7 @@ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON)' CMakeLists.txt > $tmpdir/tmp
if [ $build_type -eq 2 ]; then
sed 's/\([;"]\)[^;]*libmpi[^;]*;/\1/g;
s/\([;"]\)[^;]*libopen-[^;]*;/\1/g;
s,[^; "]*/Users[^;]*/,,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[^;]*/,,g; \
s,[^; "]*/Users[^;]*/,,g;
s/\([;"]\)[^;]*general[^;]*;/\1/g' $f > $tmpdir/$base
grep -v 'VISIT_PARALLEL ' $tmpdir/$base > $tmpdir/tmp
mv $tmpdir/tmp $tmpdir/$base
......@@ -273,10 +273,12 @@ endif()/' $setup > $tmpdir/tmp
| head -1 | cut -f2 -d\) | cut -f2 -d' ' | cut -f1 -d\.)
cxxver=$(grep CXX_COMPILER_VERSION CMakeFiles/*/CMakeCXXCompiler.cmake \
| cut -f2 -d\" | cut -f1 -d\.)
if [ $cxxver -ne $gxxver ]; then
echo "ERROR: g++ version is incompatible with VisIt"
echo "The reader must be compiled using g++ $gxxver.x"
exit 1
if [ "$gxxver"x != x ]; then
if [ $cxxver -ne $gxxver ]; then
echo "ERROR: g++ version is incompatible with VisIt"
echo "The reader must be compiled using g++ $gxxver.x"
return 1
fi
fi
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