Temp fix for fedora eroor with imgui

sofa-framework · May 28, 2024 · 397137b · 397137b
1 parent 94c354c
commit 397137b
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 1 deletion.
diff --git a/docker/sofabuilder_fedora/Dockerfile b/docker/sofabuilder_fedora/Dockerfile
@@ -58,6 +58,8 @@ RUN yum install -y -q \
     xorg-x11-server-devel\
     gtk3-devel
 
+ENV VM_BUILDS_IMGUI="false"
+
 # Install pip, numpy, scipy, pybind11
 ARG PYBIND11_VERSION=2.9.1
 #RUN curl -L https://bootstrap.pypa.io/pip/2.7/get-pip.py --output /tmp/get-pip2.py \

diff --git a/docker/sofabuilder_ubuntu/Dockerfile b/docker/sofabuilder_ubuntu/Dockerfile
@@ -65,6 +65,7 @@ RUN apt-get install -y \
     xorg-dev\
     libgtk-3-dev
 
+ENV VM_BUILDS_IMGUI="true"
 # Install pip, numpy, scipy, pybind11
 ARG PYBIND11_VERSION=2.9.1
 RUN curl -L https://bootstrap.pypa.io/pip/2.7/get-pip.py --output /tmp/get-pip2.py \

diff --git a/scripts/configure.sh b/scripts/configure.sh
@@ -447,7 +447,10 @@ elif in-array "build-scope-full" "$BUILD_OPTIONS"; then
     fi
     add-cmake-option "-DPLUGIN_SOFADISTANCEGRID=ON"
     add-cmake-option "-DPLUGIN_SOFAEULERIANFLUID=ON"
-    add-cmake-option "-DPLUGIN_SOFAGLFW=ON" "-DPLUGIN_SOFAIMGUI=ON" "-DAPPLICATION_RUNSOFAGLFW=ON" "-DSOFA_FETCH_SOFAGLFW=ON"
+    add-cmake-option "-DPLUGIN_SOFAGLFW=ON"  "-DAPPLICATION_RUNSOFAGLFW=ON" "-DSOFA_FETCH_SOFAGLFW=ON"
+    if [[ "$VM_BUILDS_IMGUI" == "true" ]]; then
+		    add-cmake-option "-DPLUGIN_SOFAIMGUI=ON"
+		fi
     add-cmake-option "-DPLUGIN_SOFAIMPLICITFIELD=ON"
     add-cmake-option "-DPLUGIN_SOFASIMPLEGUI=ON" # Not sure if worth maintaining
     add-cmake-option "-DPLUGIN_SOFASPHFLUID=ON -DSOFA_FETCH_SOFASPHFLUID=ON"

diff --git a/scripts/env/consortium-macos-2 b/scripts/env/consortium-macos-2
@@ -8,6 +8,9 @@ export VM_MAX_PARALLEL_TESTS="4"
 
 export VM_CCACHE_MAXSIZE="16G"
 
+export VM_BUILDS_IMGUI="true"
+
+
 
 export VM_HAS_BULLET="false"
 

diff --git a/scripts/env/consortium-macos-3 b/scripts/env/consortium-macos-3
@@ -8,6 +8,9 @@ export VM_MAX_PARALLEL_TESTS="4"
 
 export VM_CCACHE_MAXSIZE="16G"
 
+export VM_BUILDS_IMGUI="true"
+
+
 
 export VM_HAS_BULLET="false"
 

diff --git a/scripts/env/sofa-ci-windows10-0 b/scripts/env/sofa-ci-windows10-0
@@ -18,6 +18,8 @@ export VM_MAKE_OPTIONS="-j4"
 
 export VM_MAX_PARALLEL_TESTS="4"
 
+export VM_BUILDS_IMGUI="true"
+
 
 export VM_HAS_BULLET="false"
 

diff --git a/scripts/env/sofa-ci-windows10-1 b/scripts/env/sofa-ci-windows10-1
@@ -18,6 +18,9 @@ export VM_MAKE_OPTIONS="-j4"
 
 export VM_MAX_PARALLEL_TESTS="4"
 
+export VM_BUILDS_IMGUI="true"
+
+
 
 export VM_HAS_BULLET="false"
 

diff --git a/scripts/env/sofa-ci-windows10-2 b/scripts/env/sofa-ci-windows10-2
@@ -18,6 +18,9 @@ export VM_MAKE_OPTIONS="-j4"
 
 export VM_MAX_PARALLEL_TESTS="4"
 
+export VM_BUILDS_IMGUI="true"
+
+
 
 export VM_HAS_BULLET="false"
 

diff --git a/scripts/env/sofa-ci-windows10-3 b/scripts/env/sofa-ci-windows10-3
@@ -18,6 +18,9 @@ export VM_MAKE_OPTIONS="-j4"
 
 export VM_MAX_PARALLEL_TESTS="4"
 
+export VM_BUILDS_IMGUI="true"
+
+
 
 export VM_HAS_BULLET="false"
 

diff --git a/scripts/env/sofa-ci-windows10-4 b/scripts/env/sofa-ci-windows10-4
@@ -18,6 +18,9 @@ export VM_MAKE_OPTIONS="-j4"
 
 export VM_MAX_PARALLEL_TESTS="4"
 
+export VM_BUILDS_IMGUI="true"
+
+
 
 export VM_HAS_BULLET="false"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,6 +8,9 @@ export VM_MAX_PARALLEL_TESTS="4"

		export VM_CCACHE_MAXSIZE="16G"

		export VM_BUILDS_IMGUI="true"



		export VM_HAS_BULLET="false"

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,6 +18,8 @@ export VM_MAKE_OPTIONS="-j4"

		export VM_MAX_PARALLEL_TESTS="4"

		export VM_BUILDS_IMGUI="true"


		export VM_HAS_BULLET="false"

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,6 +18,9 @@ export VM_MAKE_OPTIONS="-j4"

		export VM_MAX_PARALLEL_TESTS="4"

		export VM_BUILDS_IMGUI="true"



		export VM_HAS_BULLET="false"

Expand Down