Skip to content

Commit 4900f66

Browse files
authored
Merge pull request #6117 from larshg/InstallFreeGlut
Install glew and glut.
2 parents 6f1105a + 5e84969 commit 4900f66

3 files changed

Lines changed: 27 additions & 2 deletions

File tree

.ci/azure-pipelines/build/macos.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ steps:
33
# find the commit hash on a quick non-forced update too
44
fetchDepth: 10
55
- script: |
6-
brew install cmake pkg-config boost eigen flann glew libusb qhull vtk glew qt5 libpcap libomp google-benchmark cjson
6+
brew install cmake pkg-config boost eigen flann glew libusb qhull vtk glew freeglut qt5 libpcap libomp google-benchmark cjson
77
brew install brewsci/science/openni
88
git clone https://github.com/abseil/googletest.git $GOOGLE_TEST_DIR # the official endpoint changed to abseil/googletest
99
cd $GOOGLE_TEST_DIR && git checkout release-1.8.1

.dev/docker/env/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ RUN apt-get update \
3737
libcjson-dev \
3838
libflann-dev \
3939
libglew-dev \
40+
freeglut3-dev \
4041
libgtest-dev \
4142
libomp-dev \
4243
libopenni-dev \

.dev/docker/windows/Dockerfile

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,30 @@ COPY $PLATFORM'-windows-rel.cmake' 'c:\vcpkg\triplets\'$PLATFORM'-windows-rel.cm
4747
4848
RUN cd .\vcpkg; `
4949
.\bootstrap-vcpkg.bat; `
50-
.\vcpkg install boost-accumulators boost-asio boost-algorithm boost-filesystem boost-format boost-graph boost-interprocess boost-iostreams boost-math boost-ptr-container boost-signals2 boost-sort boost-uuid boost-cmake flann eigen3 qhull vtk[qt,opengl] gtest benchmark openni2 cjson `
50+
.\vcpkg install `
51+
boost-accumulators `
52+
boost-asio `
53+
boost-algorithm `
54+
boost-filesystem `
55+
boost-format `
56+
boost-graph `
57+
boost-interprocess `
58+
boost-iostreams `
59+
boost-math `
60+
boost-ptr-container `
61+
boost-signals2 `
62+
boost-sort `
63+
boost-uuid `
64+
boost-cmake `
65+
flann `
66+
eigen3 `
67+
qhull `
68+
glew `
69+
freeglut `
70+
vtk[qt,opengl] `
71+
gtest `
72+
benchmark `
73+
openni2 `
74+
cjson `
5175
--triplet $Env:PLATFORM-windows-rel --host-triplet $Env:PLATFORM-windows-rel --clean-after-build --x-buildtrees-root=C:\b;
5276

0 commit comments

Comments
 (0)