fix qt4 conflict with boost #795
Open
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
|
@lianghongzhuo |
|
@lianghongzhuo actually I recommend you to resubmit pull request only using qt4 guy (here 67aa72d) |
This was referenced May 11, 2020
Closed
rdiankov
reviewed
May 11, 2020
|
@cielavenir Sorry, I didn't know you already submit your commits.
|
rdiankov
reviewed
May 11, 2020
|
@lianghongzhuo sorry if I misunderstand what you mean, but please force-push 67aa72d on the branch-point of your branch, removing other commits |
|
OK |
|
I think it looks better now. :) |
rdiankov
reviewed
May 12, 2020
| @@ -28,7 +28,12 @@ if (QT_FOUND AND QT_QTCORE_FOUND AND QT_QTGUI_FOUND AND SOQT_LIBRARY_FOUND AND C | |||
| qt4_wrap_cpp(MOC_OUTPUT_FILES ${QTCOIN_MOCS}) | |||
|
|
|||
| check_include_file(X11/Xlib.h HAVE_X11_XLIB_H) | |||
|
|
|||
| if (Boost_MINOR_VERSION LESS 65) | |||
There was a problem hiding this comment.
are you sure you don't have to test Boost MAJOR version here to be 1? For example, in the future Boost 2 might come out, then all this code will be invalid.
thanks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 pull request contains two prats: some fix from @cielavenir and qt4 conflict with boost
For the qt4 and boost conflict, you can see here as a reference.
LARG/HFO#79 (comment)