Skip to content

GitLab

Commit 0653136e authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

build script for ci updated

parent 65132ec8
Pipeline #1747 failed with stages
in 24 minutes and 2 seconds
Show whitespace changes
Inline Side-by-side
tools/build_amdis.sh
View file @ 0653136e
...@@ -20,9 +20,6 @@ if [ $# -gt 0 ]; then ...@@ -20,9 +20,6 @@ if [ $# -gt 0 ]; then
--parallel) --parallel)
COMPONENT="PARALLEL" # [SEQUENTIAL|PARALLEL] COMPONENT="PARALLEL" # [SEQUENTIAL|PARALLEL]
shift ;; shift ;;
--png)
ENABLE_PNG="1"
shift ;;
--) --)
shift shift
break ;; break ;;
...@@ -50,10 +47,6 @@ else ...@@ -50,10 +47,6 @@ else
FLAGS="-DENABLE_UMFPACK:BOOL=OFF -DENABLE_PARALLEL_DOMAIN:BOOL=ON -DENABLE_ZOLTAN:BOOL=ON" FLAGS="-DENABLE_UMFPACK:BOOL=OFF -DENABLE_PARALLEL_DOMAIN:BOOL=ON -DENABLE_ZOLTAN:BOOL=ON"
fi fi
if [ "${ENABLE_PNG}" == "1" ]; then
FLAGS="${FLAGS} -DENABLE_PNG:BOOL=ON"
fi
if [[ "${STAGE}" == "build" || "${STAGE}" == "all" ]]; then if [[ "${STAGE}" == "build" || "${STAGE}" == "all" ]]; then
# at first build AMDiS # at first build AMDiS
cmake -E make_directory ${ROOT}/build_${POSTFIX} cmake -E make_directory ${ROOT}/build_${POSTFIX}
...@@ -72,7 +65,7 @@ if [[ "${STAGE}" == "demo" || "${STAGE}" == "all" ]]; then ...@@ -72,7 +65,7 @@ if [[ "${STAGE}" == "demo" || "${STAGE}" == "all" ]]; then
BASEDIR=${ROOT}/demo BASEDIR=${ROOT}/demo
cmake -E make_directory ${BASEDIR}/build_${POSTFIX} cmake -E make_directory ${BASEDIR}/build_${POSTFIX}
cmake -E chdir ${BASEDIR}/build_${POSTFIX} cmake \ cmake -E chdir ${BASEDIR}/build_${POSTFIX} cmake \
-DAMDIS_DIR=${ROOT}/install/share/amdis \ -DAMDiS_DIR=${ROOT}/install/lib/amdis/cmake \
-DCMAKE_BUILD_TYPE=${CONFIG} \ -DCMAKE_BUILD_TYPE=${CONFIG} \
-DCOMPONENT=${COMPONENT} \ -DCOMPONENT=${COMPONENT} \
${BASEDIR} ${BASEDIR}
...@@ -84,7 +77,7 @@ if [[ "${STAGE}" == "test" || "${STAGE}" == "all" ]]; then ...@@ -84,7 +77,7 @@ if [[ "${STAGE}" == "test" || "${STAGE}" == "all" ]]; then
BASEDIR=${ROOT}/test BASEDIR=${ROOT}/test
cmake -E make_directory ${BASEDIR}/build_${POSTFIX} cmake -E make_directory ${BASEDIR}/build_${POSTFIX}
cmake -E chdir ${BASEDIR}/build_${POSTFIX} cmake \ cmake -E chdir ${BASEDIR}/build_${POSTFIX} cmake \
-DAMDIS_DIR=${ROOT}/install/share/amdis \ -DAMDiS_DIR=${ROOT}/install/lib/amdis/cmake \
-DCMAKE_BUILD_TYPE=${CONFIG} \ -DCMAKE_BUILD_TYPE=${CONFIG} \
-DCOMPONENT=${COMPONENT} \ -DCOMPONENT=${COMPONENT} \
${BASEDIR} ${BASEDIR}
......
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