0001-mainbar-fix-build-without-libsigrokdecode.patch 1.1 KB

12345678910111213141516171819202122232425262728293031323334353637
  1. From da124df864dd7555733d6690eacf856435d55b2d Mon Sep 17 00:00:00 2001
  2. From: Bartosz Golaszewski <brgl@bgdev.pl>
  3. Date: Mon, 3 Dec 2018 13:14:16 +0100
  4. Subject: [PATCH] mainbar: fix build without libsigrokdecode
  5. We must not include decodesignal.hpp if we're not using libsigrokdecode
  6. or the build will fail due to libsigrokdecode.hpp not being present in
  7. the system.
  8. Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
  9. ---
  10. pv/toolbars/mainbar.cpp | 2 +-
  11. 1 file changed, 1 insertion(+), 1 deletion(-)
  12. diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp
  13. index e6beb2b..7c4d0fb 100644
  14. --- a/pv/toolbars/mainbar.cpp
  15. +++ b/pv/toolbars/mainbar.cpp
  16. @@ -35,7 +35,6 @@
  17. #include <boost/algorithm/string/join.hpp>
  18. -#include <pv/data/decodesignal.hpp>
  19. #include <pv/devicemanager.hpp>
  20. #include <pv/devices/hardwaredevice.hpp>
  21. #include <pv/devices/inputfile.hpp>
  22. @@ -52,6 +51,7 @@
  23. #include <pv/widgets/importmenu.hpp>
  24. #ifdef ENABLE_DECODE
  25. #include <pv/widgets/decodermenu.hpp>
  26. +#include <pv/data/decodesignal.hpp>
  27. #endif
  28. #include <libsigrokcxx/libsigrokcxx.hpp>
  29. --
  30. 2.19.1