Skip to content

Commit d369f79

Browse files
committed
Temp fix for fedora eroor with imgui
1 parent 2e8f98c commit d369f79

File tree

10 files changed

+27
-1
lines changed

10 files changed

+27
-1
lines changed

docker/sofabuilder_fedora/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ RUN yum install -y -q \
5858
xorg-x11-server-devel\
5959
gtk3-devel
6060

61+
ENV VM_BUILDS_IMGUI="false"
62+
6163
# Install pip, numpy, scipy, pybind11
6264
ARG PYBIND11_VERSION=2.9.1
6365
#RUN curl -L https://bootstrap.pypa.io/pip/2.7/get-pip.py --output /tmp/get-pip2.py \

docker/sofabuilder_ubuntu/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ RUN apt-get install -y \
6565
xorg-dev\
6666
libgtk-3-dev
6767

68+
ENV VM_BUILDS_IMGUI="true"
6869
# Install pip, numpy, scipy, pybind11
6970
ARG PYBIND11_VERSION=2.9.1
7071
RUN curl -L https://bootstrap.pypa.io/pip/2.7/get-pip.py --output /tmp/get-pip2.py \

scripts/configure.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,10 @@ elif in-array "build-scope-full" "$BUILD_OPTIONS"; then
447447
fi
448448
add-cmake-option "-DPLUGIN_SOFADISTANCEGRID=ON"
449449
add-cmake-option "-DPLUGIN_SOFAEULERIANFLUID=ON"
450-
add-cmake-option "-DPLUGIN_SOFAGLFW=ON" "-DPLUGIN_SOFAIMGUI=ON" "-DAPPLICATION_RUNSOFAGLFW=ON" "-DSOFA_FETCH_SOFAGLFW=ON"
450+
add-cmake-option "-DPLUGIN_SOFAGLFW=ON" "-DAPPLICATION_RUNSOFAGLFW=ON" "-DSOFA_FETCH_SOFAGLFW=ON"
451+
if [[ "$VM_BUILDS_IMGUI" == "true" ]]; then
452+
add-cmake-option "-DPLUGIN_SOFAIMGUI=ON"
453+
fi
451454
add-cmake-option "-DPLUGIN_SOFAIMPLICITFIELD=ON"
452455
add-cmake-option "-DPLUGIN_SOFASIMPLEGUI=ON" # Not sure if worth maintaining
453456
add-cmake-option "-DPLUGIN_SOFASPHFLUID=ON -DSOFA_FETCH_SOFASPHFLUID=ON"

scripts/env/consortium-macos-2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ export VM_MAX_PARALLEL_TESTS="4"
88

99
export VM_CCACHE_MAXSIZE="16G"
1010

11+
export VM_BUILDS_IMGUI="true"
12+
13+
1114

1215
export VM_HAS_BULLET="false"
1316

scripts/env/consortium-macos-3

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ export VM_MAX_PARALLEL_TESTS="4"
88

99
export VM_CCACHE_MAXSIZE="16G"
1010

11+
export VM_BUILDS_IMGUI="true"
12+
13+
1114

1215
export VM_HAS_BULLET="false"
1316

scripts/env/sofa-ci-windows10-0

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ export VM_MAKE_OPTIONS="-j4"
1818

1919
export VM_MAX_PARALLEL_TESTS="4"
2020

21+
export VM_BUILDS_IMGUI="true"
22+
2123

2224
export VM_HAS_BULLET="false"
2325

scripts/env/sofa-ci-windows10-1

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ export VM_MAKE_OPTIONS="-j4"
1818

1919
export VM_MAX_PARALLEL_TESTS="4"
2020

21+
export VM_BUILDS_IMGUI="true"
22+
23+
2124

2225
export VM_HAS_BULLET="false"
2326

scripts/env/sofa-ci-windows10-2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ export VM_MAKE_OPTIONS="-j4"
1818

1919
export VM_MAX_PARALLEL_TESTS="4"
2020

21+
export VM_BUILDS_IMGUI="true"
22+
23+
2124

2225
export VM_HAS_BULLET="false"
2326

scripts/env/sofa-ci-windows10-3

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ export VM_MAKE_OPTIONS="-j4"
1818

1919
export VM_MAX_PARALLEL_TESTS="4"
2020

21+
export VM_BUILDS_IMGUI="true"
22+
23+
2124

2225
export VM_HAS_BULLET="false"
2326

scripts/env/sofa-ci-windows10-4

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ export VM_MAKE_OPTIONS="-j4"
1818

1919
export VM_MAX_PARALLEL_TESTS="4"
2020

21+
export VM_BUILDS_IMGUI="true"
22+
23+
2124

2225
export VM_HAS_BULLET="false"
2326

0 commit comments

Comments
 (0)