From ddb69b7b4f114f3c2ca01adf55712792ca8aed43 Mon Sep 17 00:00:00 2001 From: bkuhls Date: Thu, 25 Oct 2018 08:34:44 +0200 Subject: [PATCH] FindZeroMQ: fix header detection (#174) FindZeroMQ.cmake, added by https://github.com/jacksonliam/mjpg-streamer/commit/8943c44e69d66650b9b1c5f873546579bfae7d2c#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 --- mjpg-streamer-experimental/cmake/FindZeroMQ.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mjpg-streamer-experimental/cmake/FindZeroMQ.cmake b/mjpg-streamer-experimental/cmake/FindZeroMQ.cmake index 69092e55..c64e7b73 100644 --- a/mjpg-streamer-experimental/cmake/FindZeroMQ.cmake +++ b/mjpg-streamer-experimental/cmake/FindZeroMQ.cmake @@ -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} )