0004-gr-qtgui-dont-t-add-examples-c-subdirectory-when-gr-.patch 2.1 KB

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