Merge branch 'cmake' of magit1.mpie.de:damask/DAMASK into cmake

This commit is contained in:
Chen Zhang 2016-03-05 17:36:03 -05:00
commit 5b7a149eb9
3 changed files with 11 additions and 10 deletions

1
.gitignore vendored
View File

@ -5,3 +5,4 @@
*.bak *.bak
*~ *~
PRIVATE PRIVATE
build

View File

@ -16,10 +16,10 @@ if [ ! -d build ]; then
fi fi
cd build cd build
if [ -d build_FEM ] ; then if [ -d build_FEM ] ; then
rm -rf build_FEM rm -rf FEM
fi fi
mkdir build_FEM mkdir FEM
cd build_FEM cd FEM
## ##
# CMake call # CMake call
@ -43,4 +43,4 @@ echo
echo "Please move to the build directory using" echo "Please move to the build directory using"
echo " cd build/build_spectral" echo " cd build/build_spectral"
echo "Using the following command to build DAMASK spectral solver" echo "Using the following command to build DAMASK spectral solver"
echo " make clean all install" echo " make clean all install"

View File

@ -15,11 +15,11 @@ if [ ! -d build ]; then
mkdir build mkdir build
fi fi
cd build cd build
if [ -d build_spectral ] ; then if [ -d build ] ; then
rm -rf build_spectral rm -rf build
fi fi
mkdir build_spectral mkdir build
cd build_spectral cd build
## ##
# CMake call # CMake call
@ -41,6 +41,6 @@ cmake -D PETSC_DIR=${PETSC_DIR} \
echo echo
echo "Please move to the build directory using" echo "Please move to the build directory using"
echo " cd build/build_spectral" echo " cd build/spectral"
echo "Using the following command to build DAMASK spectral solver" echo "Using the following command to build DAMASK spectral solver"
echo " make clean all install" echo " make clean all install"