From 5e30d0fce50a589cc5f8e6edf3c5fa608b7a0adc Mon Sep 17 00:00:00 2001
From: Rene Halver <r.halver@fz-juelich.de>
Date: Wed, 2 Dec 2020 16:07:21 +0100
Subject: [PATCH] changed build scripts to adhere to new image
---
ci/build_mpi_complete.sh | 4 +---
ci/build_mpi_complete_gcc8.sh | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/ci/build_mpi_complete.sh b/ci/build_mpi_complete.sh
index 1bada25..670a31e 100755
--- a/ci/build_mpi_complete.sh
+++ b/ci/build_mpi_complete.sh
@@ -14,9 +14,7 @@ mkdir -p build && cd build
if [[ $? == 0 ]]; then
#CC=/usr/lib64/mpi/gcc/openmpi3/bin/mpicc CXX=/usr/lib64/mpi/gcc/openmpi3/bin/mpicxx FC=/usr/lib64/mpi/gcc/openmpi3/bin/mpif90 ${CMAKE} ..
- ln -s /usr/bin/vtk7 /usr/bin/vtk
- ln -s /usr/bin/vtk7 /usr/bin/pvtk
- ${CMAKE} .. -DCM_ALL_FORTRAN=ON -DCM_ALL_USE_F08=ON -DCM_ALL_VORONOI=ON -DCM_ALL_VTK_OUTPUT=ON -DCM_ALL_TESTS=ON -DCM_ALL_AUTO_DOC=ON -DVTK_DIR=/usr/local/lib/cmake/vtk-8.2
+ ${CMAKE} .. -DCM_ALL_FORTRAN=ON -DCM_ALL_USE_F08=ON -DCM_ALL_VORONOI=ON -DCM_ALL_VTK_OUTPUT=ON -DCM_ALL_TESTS=ON -DCM_ALL_AUTO_DOC=ON -DVTK_DIR=/usr/local/lib/cmake/vtk-7.1
make VERBOSE=1
make test
diff --git a/ci/build_mpi_complete_gcc8.sh b/ci/build_mpi_complete_gcc8.sh
index 4e6df36..a91b282 100755
--- a/ci/build_mpi_complete_gcc8.sh
+++ b/ci/build_mpi_complete_gcc8.sh
@@ -14,9 +14,7 @@ mkdir -p build && cd build
if [[ $? == 0 ]]; then
#CC=/usr/lib64/mpi/gcc/openmpi3/bin/mpicc CXX=/usr/lib64/mpi/gcc/openmpi3/bin/mpicxx FC=/usr/lib64/mpi/gcc/openmpi3/bin/mpif90 ${CMAKE} ..
- ln -s /usr/bin/vtk7 /usr/bin/vtk
- ln -s /usr/bin/vtk7 /usr/bin/pvtk
- ${CMAKE} .. -DCM_ALL_FORTRAN=ON -DCM_ALL_VORONOI=ON -DCM_ALL_VTK_OUTPUT=ON -DCM_ALL_TESTS=ON -DCM_ALL_AUTO_DOC=ON -DVTK_DIR=/usr/local/lib/cmake/vtk-8.2
+ ${CMAKE} .. -DCM_ALL_FORTRAN=ON -DCM_ALL_VORONOI=ON -DCM_ALL_VTK_OUTPUT=ON -DCM_ALL_TESTS=ON -DCM_ALL_AUTO_DOC=ON -DVTK_DIR=/usr/local/lib/cmake/vtk-7.1
make VERBOSE=1
make test
--
GitLab