This repository has been archived by the owner on Sep 1, 2021. It is now read-only.
Explicitly look for X11 when using it. #13
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This fixes the build with CMake 3.2, whose FindOpenGL.cmake stopped calling find_package(X11). Instead, do that ourselves when Q_WS_X11 is true, since that is when we already try to link against libX11.
|
Looks good to me. |
cryos
added a commit
that referenced
this pull request
Jun 15, 2015
Explicitly look for X11 when using it.
This was referenced Apr 27, 2016
Closed
Closed
Closed
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes the build with CMake 3.2, whose FindOpenGL.cmake stopped
calling
find_package(X11).Instead, do that ourselves when
Q_WS_X11is true, since that is when wealready try to link against libX11.
(It's not clear if this repository will ever be updated given Avogadro2 is being worked on, but this patch might interest other packagers who come across the same problem)