Skip to content

Commit

Permalink
Add cli11 to VCPKG_DEPENDENCIES_LEGACY and Conda legacy env (#1230)
Browse files Browse the repository at this point in the history
* Needed by gazebosim/gz-utils#167.
* Add conda-forge cli11 pixi-2.1.2

Signed-off-by: Steve Peters <[email protected]>
Signed-off-by: Jose Luis Rivero <[email protected]>
Co-authored-by: Jose Luis Rivero <[email protected]>
  • Loading branch information
scpeters and j-rivero authored Jan 21, 2025
1 parent a51f3b8 commit 343aad7
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 1 deletion.
48 changes: 48 additions & 0 deletions conda/envs/legacy/pixi.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions conda/envs/legacy/pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ ruby = "3.2.*"
tinyxml2 = "*"
yaml = "*"
zeromq = "4.3.4"
cli11 = "2.1.2.*"

[target.win-64.dependencies]
dlfcn-win32 = "*"
Expand Down
2 changes: 1 addition & 1 deletion jenkins-scripts/lib/windows_env_vars.bat
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ if NOT DEFINED VCPKG_SNAPSHOT (
set VCPKG_SNAPSHOT=2022.02.23
)
:: Set of common gz dependencies expected up to Garden
set VCPKG_DEPENDENCIES_LEGACY=assimp boost-core bullet3 ccd console-bridge cppzmq cuda curl dlfcn-win32 eigen3 fcl ffmpeg freeimage gdal gflags glib gts jsoncpp libyaml libzip ogre ogre2 ogre22 openssl protobuf pybind11 qt5 qt5-winextras qwt spdlog sqlite3 tinyxml2 zeromq
set VCPKG_DEPENDENCIES_LEGACY=assimp boost-core bullet3 ccd cli11 console-bridge cppzmq cuda curl dlfcn-win32 eigen3 fcl ffmpeg freeimage gdal gflags glib gts jsoncpp libyaml libzip ogre ogre2 ogre22 openssl protobuf pybind11 qt5 qt5-winextras qwt spdlog sqlite3 tinyxml2 zeromq

goto :EOF

0 comments on commit 343aad7

Please sign in to comment.