Skip to content

Commit c857f6c

Browse files
committed
[vcpkg] Use system installed imgui
1 parent a9da476 commit c857f6c

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

.github/workflows/ci_windows.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
bullet3
4848
freeglut
4949
glfw3
50-
imgui
50+
imgui[opengl2-binding]
5151
nlopt
5252
opengl
5353
osg
@@ -79,7 +79,7 @@ jobs:
7979
-DDART_MSVC_DEFAULT_OPTIONS=ON ^
8080
-DDART_VERBOSE=ON ^
8181
-DBUILD_SHARED_LIBS=${{ matrix.build_shared_libs }} ^
82-
-DDART_USE_SYSTEM_IMGUI=OFF ^
82+
-DDART_USE_SYSTEM_IMGUI=ON ^
8383
|| exit /b
8484
cmake ^
8585
--build build ^

.github/workflows/publish_dartpy.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
bullet3
110110
freeglut
111111
glfw3
112-
imgui
112+
imgui[opengl2-binding]
113113
nlopt
114114
opengl
115115
osg

setup.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,10 @@ def build_extension(self, ext: CMakeExtension) -> None:
162162
# CMake 3.12+ only.
163163
build_args += [f"-j{self.parallel}"]
164164

165-
cmake_args += ["-DDART_USE_SYSTEM_IMGUI=OFF"]
165+
if sys.platform.startswith("msvc"):
166+
cmake_args += ["-DDART_USE_SYSTEM_IMGUI=ON"]
167+
else:
168+
cmake_args += ["-DDART_USE_SYSTEM_IMGUI=OFF"]
166169

167170
build_temp = Path(self.build_temp) / ext.name
168171
if not build_temp.exists():

0 commit comments

Comments
 (0)