[vcpkg] Use system installed imgui

henriquealrs · Jun 30, 2024 · c857f6c · c857f6c
1 parent a9da476
commit c857f6c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/ci_windows.yml b/.github/workflows/ci_windows.yml
@@ -47,7 +47,7 @@ jobs:
             bullet3
             freeglut
             glfw3
-            imgui
+            imgui[opengl2-binding]
             nlopt
             opengl
             osg
@@ -79,7 +79,7 @@ jobs:
             -DDART_MSVC_DEFAULT_OPTIONS=ON ^
             -DDART_VERBOSE=ON ^
             -DBUILD_SHARED_LIBS=${{ matrix.build_shared_libs }} ^
-            -DDART_USE_SYSTEM_IMGUI=OFF ^
+            -DDART_USE_SYSTEM_IMGUI=ON ^
             || exit /b
           cmake ^
             --build build ^

diff --git a/.github/workflows/publish_dartpy.yml b/.github/workflows/publish_dartpy.yml
@@ -109,7 +109,7 @@ jobs:
             bullet3
             freeglut
             glfw3
-            imgui
+            imgui[opengl2-binding]
             nlopt
             opengl
             osg

diff --git a/setup.py b/setup.py
@@ -162,7 +162,10 @@ def build_extension(self, ext: CMakeExtension) -> None:
                 # CMake 3.12+ only.
                 build_args += [f"-j{self.parallel}"]
 
-        cmake_args += ["-DDART_USE_SYSTEM_IMGUI=OFF"]
+        if sys.platform.startswith("msvc"):
+            cmake_args += ["-DDART_USE_SYSTEM_IMGUI=ON"]
+        else:
+            cmake_args += ["-DDART_USE_SYSTEM_IMGUI=OFF"]
 
         build_temp = Path(self.build_temp) / ext.name
         if not build_temp.exists():
-Original file line number
+Diff line change
@@ Expand Up / @@ -109,7 +109,7 @@ jobs: @@
                 bullet3
                 freeglut
                 glfw3
-                imgui
+                imgui[opengl2-binding]
                 nlopt
                 opengl
                 osg
@@ Expand Down @@