Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
pirvi-public
glfw
Commits
94c7aa0d
Commit
94c7aa0d
authored
Jan 05, 2018
by
Emmanuel Gil Peyrot
Committed by
linkmauve
Jan 29, 2018
Browse files
Bump wayland-protocols to 1.12
parent
f2617a67
Changes
2
Hide whitespace changes
Inline
Side-by-side
.travis.yml
View file @
94c7aa0d
...
...
@@ -58,7 +58,7 @@ script:
sudo dpkg -i extra-cmake-modules_5.38.0a-0ubuntu1_amd64.deb;
git clone git://anongit.freedesktop.org/wayland/wayland-protocols;
pushd wayland-protocols;
git checkout 1.
6
&& ./autogen.sh --prefix=/usr && make && sudo make install;
git checkout 1.
12
&& ./autogen.sh --prefix=/usr && make && sudo make install;
popd;
fi
-
cmake -DCMAKE_VERBOSE_MAKEFILE=ON -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} -DGLFW_USE_WAYLAND=${USE_WAYLAND} ..
...
...
CMakeLists.txt
View file @
94c7aa0d
...
...
@@ -277,7 +277,7 @@ if (_GLFW_WAYLAND)
find_package
(
Wayland REQUIRED Client Cursor Egl
)
find_package
(
WaylandScanner REQUIRED
)
find_package
(
WaylandProtocols 1.
6
REQUIRED
)
find_package
(
WaylandProtocols 1.
12
REQUIRED
)
list
(
APPEND glfw_PKG_DEPS
"wayland-egl"
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment