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