Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions dockerfiles/flow-dev-gnu/libs-build-gnu/petsc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ cfg_opt_Debug= \
--download-metis=yes --download-parmetis=yes \
--download-blacs=yes --download-scalapack=yes \
--download-mumps=yes --download-hypre=https://github.com/hypre-space/hypre/archive/v$(hypre_version).tar.gz \
--download-cmake=yes \
--with-debugging=1 --with-shared-libraries=1 \
--with-make-np $(n_jobs) \
--CFLAGS="-O" \
Expand All @@ -35,6 +36,7 @@ cfg_opt_Release= \
--download-metis=yes --download-parmetis=yes \
--download-blacs=yes --download-scalapack=yes \
--download-mumps=yes --download-hypre=https://github.com/hypre-space/hypre/archive/v$(hypre_version).tar.gz \
--download-cmake=yes \
--with-debugging=0 --with-shared-libraries=1 \
--with-make-np $(n_jobs) \
--CFLAGS="-O3 -DNDEBUG" \
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/libs-intel/libs-build-intel/yamlcpp/Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Simple makefile for building and packaging project Yaml cpp

library=yamlcpp
url=https://flow.nti.tul.cz/libraries/yaml-cpp-yaml-cpp-$(version).zip
base_name=yaml-cpp-yaml-cpp-$(version)
url=https://flow.nti.tul.cz/libraries/yaml-cpp-$(version).zip
base_name=yaml-cpp-$(version)

# In order to combine staticaly linked yamlcpp with dynamicaly linked res of the code.
CXX_FLAGS=-fPIE
Expand Down
2 changes: 1 addition & 1 deletion images_version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0.3
4.0.5
10 changes: 5 additions & 5 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ build_gnu=$(build) -f Dockerfile-gnu
build_intel=$(build) -f Dockerfile-intel
run=docker run -v ${PWD}/$(build_dir):/build_dir -w /build_dir
versions=--build-arg ver_yamlcpp=0e6e28d \
--build-arg ver_armadillo=12.2.0 \
--build-arg ver_mpich=4.0.3 \
--build-arg ver_petsc=v3.18.6 \
--build-arg ver_hypre=2.25.0 \
--build-arg ver_armadillo=15.2.4 \
--build-arg ver_mpich=5.0.1 \
--build-arg ver_hypre=3.1.0 \
--build-arg ver_petsc=3.25.0 \
--build-arg ver_bddcml=2.6 \
--build-arg ver_permon=3.18.0
--build-arg ver_permon=3.25.0
ver_boost=--build-arg boost_version=1.74
# TODO: write versions available into the image and use autoamticaly in Flow123d configuration

Expand Down
Loading