Merge branch 'cmake' of magit1.mpie.de:damask/DAMASK into cmake
This commit is contained in:
commit
5b7a149eb9
|
@ -5,3 +5,4 @@
|
|||
*.bak
|
||||
*~
|
||||
PRIVATE
|
||||
build
|
||||
|
|
|
@ -16,10 +16,10 @@ if [ ! -d build ]; then
|
|||
fi
|
||||
cd build
|
||||
if [ -d build_FEM ] ; then
|
||||
rm -rf build_FEM
|
||||
rm -rf FEM
|
||||
fi
|
||||
mkdir build_FEM
|
||||
cd build_FEM
|
||||
mkdir FEM
|
||||
cd FEM
|
||||
|
||||
##
|
||||
# CMake call
|
||||
|
@ -43,4 +43,4 @@ echo
|
|||
echo "Please move to the build directory using"
|
||||
echo " cd build/build_spectral"
|
||||
echo "Using the following command to build DAMASK spectral solver"
|
||||
echo " make clean all install"
|
||||
echo " make clean all install"
|
||||
|
|
|
@ -15,11 +15,11 @@ if [ ! -d build ]; then
|
|||
mkdir build
|
||||
fi
|
||||
cd build
|
||||
if [ -d build_spectral ] ; then
|
||||
rm -rf build_spectral
|
||||
if [ -d build ] ; then
|
||||
rm -rf build
|
||||
fi
|
||||
mkdir build_spectral
|
||||
cd build_spectral
|
||||
mkdir build
|
||||
cd build
|
||||
|
||||
##
|
||||
# CMake call
|
||||
|
@ -41,6 +41,6 @@ cmake -D PETSC_DIR=${PETSC_DIR} \
|
|||
|
||||
echo
|
||||
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 " make clean all install"
|
||||
echo " make clean all install"
|
||||
|
|
Loading…
Reference in New Issue