FindZeroMQ: fix header detection #174
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
FindZeroMQ.cmake, added by 8943c44#diff-1760adaac68b242c02c752a6efc72effR11 checks for zmq.hpp but the ZeroMQ output module includes zmq.h instead: https://github.com/jacksonliam/mjpg-streamer/blob/master/mjpg-streamer-experimental/plugins/output_zmqserver/output_zmqserver.c#L40 so let's check for this file instead because the output module is not written in C++. For reference see this Debian bug report about the split of the zeromq and cppzmq packages: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=697743 This patch fixes a configure error on systems where cppzmq is not present: http://autobuild.buildroot.net/results/dad/dad054954de76cab56333747274520f269be2066/build-end.log
|
Thanks, Looks ok to me! @machinekoder I assume you don't see any problems with this? |
|
Good point, 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.
FindZeroMQ.cmake, added by
8943c44#diff-1760adaac68b242c02c752a6efc72effR11
checks for zmq.hpp but the ZeroMQ output module includes zmq.h instead:
https://github.com/jacksonliam/mjpg-streamer/blob/master/mjpg-streamer-experimental/plugins/output_zmqserver/output_zmqserver.c#L40
so let's check for this file instead because the output module is not
written in C++. For reference see this Debian bug report about the split
of the zeromq and cppzmq packages:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=697743
This patch fixes a configure error on systems where cppzmq is not
present:
http://autobuild.buildroot.net/results/dad/dad054954de76cab56333747274520f269be2066/build-end.log