1From 268b1a599304f58bd56c86ff09041b5912c24a0c Mon Sep 17 00:00:00 2001
2From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
3Date: Sun, 1 Nov 2020 17:24:36 +0100
4Subject: [PATCH] gr-qtgui: dont't add examples/c++ subdirectory when gr-analog
5 is disabled
6
7gr-qtgui examples needs to have gr-analog enabled, without this dependency
8compile crash with:
9
10In file included from
11/x/output/build/gnuradio-3.8.1.0/gr-qtgui/examples/c++/display_qt.cc:22:
12/x/output/build/gnuradio-3.8.1.0/gr-qtgui/examples/c++/display_qt.h:24:10:
13fatal error: gnuradio/analog/noise_source.h: No such file or directory
1424 | #include <gnuradio/analog/noise_source.h>
15| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
16compilation terminated.
17make[3]: *** [gr-qtgui/examples/c++/CMakeFiles/display_qt.dir/build.make:67:
18gr-qtgui/examples/c++/CMakeFiles/display_qt.dir/display_qt.cc.o] Error 1
19make[3]: *** Waiting for unfinished jobs....
20In file included from
21/somewhere/gnuradio/build/gr-qtgui/examples/c++/moc_display_qt.cpp:10:
22/somewhere/gnuradio/build/gr-qtgui/examples/c++/../../../../gr-qtgui/examples/c++/display_qt.h:24:10:
23fatal error: gnuradio/analog/noise_source.h: No such file or directory
2424 | #include <gnuradio/analog/noise_source.h>
25| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
26compilation terminated.
27
28GR_ANALOG is not an explicit dependency of GR_QTGUI, so disable c++ examples if
29user has not selected this option.
30
31[backported from 7470a7a3771dd90defb826b464dfe62977cb1eb6]
32
33Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
34---
35 gr-qtgui/CMakeLists.txt | 4 +++-
36 1 file changed, 3 insertions(+), 1 deletion(-)
37
38diff --git a/gr-qtgui/CMakeLists.txt b/gr-qtgui/CMakeLists.txt
39index 8831f3ad9..561186fbd 100644
40--- a/gr-qtgui/CMakeLists.txt
41+++ b/gr-qtgui/CMakeLists.txt
42@@ -68,7 +68,9 @@ if(ENABLE_GR_QTGUI)
43 add_subdirectory(include/gnuradio/qtgui)
44 add_subdirectory(lib)
45 add_subdirectory(docs)
46-add_subdirectory(examples/c++)
47+if (ENABLE_GR_ANALOG)
48+	add_subdirectory(examples/c++)
49+endif(ENABLE_GR_ANALOG)
50 if(ENABLE_PYTHON)
51     add_subdirectory(swig)
52     add_subdirectory(python/qtgui)
53--
542.26.2
55
56