Skip to content

Commit

Permalink
FindZeroMQ: fix header detection (#174)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bkuhls authored and jacksonliam committed Oct 25, 2018
1 parent 686c3be commit ddb69b7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion mjpg-streamer-experimental/cmake/FindZeroMQ.cmake
Expand Up @@ -8,7 +8,7 @@ endif()

## use the hint from above to find where 'zmq.hpp' is located
find_path(ZeroMQ_INCLUDE_DIR
NAMES zmq.hpp
NAMES zmq.h
HINTS ${PC_ZeroMQ_INCLUDEDIR} ${PC_ZeroMQ_INCLUDE_DIRS}
)

Expand Down

0 comments on commit ddb69b7

Please sign in to comment.