aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-multimedia/mjpg-streamer/mjpg-streamer/0001-slightly-unbreak-raspi-cmake.patch
blob: 0657240d0529e580af51291d6864fc0e38f76cd0 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
From ce462835e1155b38ddad73790adbc289b91dd95e Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Sun, 3 Dec 2017 09:21:38 +0100
Subject: [PATCH] slightly unbreak raspi cmake

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 .../plugins/input_raspicam/CMakeLists.txt              | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/mjpg-streamer-experimental/plugins/input_raspicam/CMakeLists.txt b/mjpg-streamer-experimental/plugins/input_raspicam/CMakeLists.txt
index bb645b2..74347d4 100644
--- a/mjpg-streamer-experimental/plugins/input_raspicam/CMakeLists.txt
+++ b/mjpg-streamer-experimental/plugins/input_raspicam/CMakeLists.txt
@@ -1,23 +1,11 @@
+check_include_files(interface/vcos/vcos.h HAS_RPI)
 
-if (EXISTS /opt/vc/include)
-    set(HAS_RASPI ON)
-else()
-    set(HAS_RASPI OFF)
+if(HAS_RPI)
+    MJPG_STREAMER_PLUGIN_OPTION(input_raspicam "Raspberry Pi input camera plugin")
 endif()
 
-MJPG_STREAMER_PLUGIN_OPTION(input_raspicam "Raspberry Pi input camera plugin"
-                            ONLYIF HAS_RASPI)
-
 if (PLUGIN_INPUT_RASPICAM)
 
-    include_directories(/opt/vc/include)
-    include_directories(/opt/vc/include/interface/vcos)
-    include_directories(/opt/vc/include/interface/vcos/pthreads)
-    include_directories(/opt/vc/include/interface/vmcs_host)
-    include_directories(/opt/vc/include/interface/vmcs_host/linux)
-
-    link_directories(/opt/vc/lib)
-
     MJPG_STREAMER_PLUGIN_COMPILE(input_raspicam input_raspicam.c)
 
     target_link_libraries(input_raspicam mmal_core mmal_util mmal_vc_client vcos bcm_host)
-- 
2.0.1