Skip to content

Commit 51d8b21

Browse files
committed
docker: default STIR_BUILD_EXECUTABLES=ON
- follow-up to #1026
1 parent d519891 commit 51d8b21

3 files changed

Lines changed: 3 additions & 2 deletions

File tree

CHANGES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
- Use Ubuntu 24.04 as base-image (#1003)
1717
- `STIR_DISABLE_HDF5=OFF`
1818
- `STIR_BUILD_SHARED_LIBS=ON`
19+
- `STIR_BUILD_EXECUTABLES=ON`
1920
- improve caching, devel with full build env (#1013)
2021
- SWIG: <4.5 (#1030)
2122
- Devcontainer (#1026) intended for local VSCode development:
2223
- `DEVEL_BUILD=ON`
23-
- `STIR_BUILD_EXECUTABLES=ON`
2424
- `RUN_CTEST=0`
2525
- extensions (Python, Jupyter, CMake, ...)
2626
- VM:

Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ ARG CMAKE_BUILD_TYPE="Release"
6565
ARG STIR_ENABLE_OPENMP="ON"
6666
ARG STIR_DISABLE_HDF5="OFF"
6767
ARG STIR_BUILD_SHARED_LIBS="ON"
68+
ARG STIR_BUILD_EXECUTABLES="ON"
6869
ARG USE_SYSTEM_Armadillo="ON"
6970
ARG USE_SYSTEM_Boost="ON"
7071
ARG USE_SYSTEM_FFTW3="ON"
@@ -86,6 +87,7 @@ RUN --mount=type=cache,target=/opt/ccache BUILD_FLAGS="-G Ninja\
8687
-DSTIR_ENABLE_OPENMP=${STIR_ENABLE_OPENMP}\
8788
-DSTIR_DISABLE_HDF5=${STIR_DISABLE_HDF5}\
8889
-DSTIR_BUILD_SHARED_LIBS:BOOL=${STIR_BUILD_SHARED_LIBS}\
90+
-DSTIR_BUILD_EXECUTABLES:BOOL=${STIR_BUILD_EXECUTABLES}\
8991
-DUSE_SYSTEM_Armadillo=${USE_SYSTEM_Armadillo}\
9092
-DUSE_SYSTEM_Boost=${USE_SYSTEM_Boost}\
9193
-DUSE_SYSTEM_FFTW3=${USE_SYSTEM_FFTW3}\

docker/docker-compose.devcontainer.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ services:
55
RUN_CTEST: 0
66
EXTRA_BUILD_FLAGS: >
77
-DDEVEL_BUILD:BOOL=ON
8-
-DSTIR_BUILD_EXECUTABLES:BOOL=ON
98
sirf:
109
group_add: [1007] # set this to $GROUPS or similar for access to host mounts
1110
ports: !override [9002, 8888]

0 commit comments

Comments
 (0)