osmocom-sdr

osmocom-sdr@lists.osmocom.org

917 discussions

gr-fosphor on OSX & GNURadio 3.8
by Daniel O'Connor 24 Jun '21

24 Jun '21

Hi, I'm trying to build gr-fosphor on OSX, GNURadio 3.8 & Python 3.7.10 (built from Macports) but it blows up in a swig wrapper: [ 80%] Building CXX object swig/CMakeFiles/fosphor_swig.dir/CMakeFiles/fosphor_swig.dir/fosphor_swigPYTHON_wrap.cxx.o warning: unknown warning option '-Wno-format-overflow'; did you mean '-Wno-shift-overflow'? [-Wunknown-warning-option] /Users/oconnd1/projects/gr-fosphor/build/swig/CMakeFiles/fosphor_swig.dir/fosphor_swigPYTHON_wrap.cxx:5219:14: error: no viable overloaded '=' result = gr::fosphor::glfw_sink_c::make(); ~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Full build log is at https://gist.github.com/DanielO/8a75d1cc2848f773e702d788fa8275b8 I ran cmake like so: cmake -DGR_PYTHON_DIR=/opt/local/Library/Frameworks/Python.framework/Versions/3.7/lib/python3.7/site-packages -DCMAKE_INSTALL_PREFIX=/opt/local -Wno-dev .. I am happy to test any patches etc but unfortunately my C++/Swig skills are nonexistent :( Thanks. -- Daniel O'Connor "The nice thing about standards is that there are so many of them to choose from." -- Andrew Tanenbaum

1 0

problem to install gr-osmosdr
by alberto.alletto＠alice.it 11 Apr '21

11 Apr '21

Hi to all!I'm new on ubuntu world...but I need to install gnuradio .. I am following a guide: sudo apt-get install python3-pip sudo pip3 install pybombs pybombs auto-config pybombs recipes add-defaults pybombs prefix init ~/prefix-3.8 -R gnuradio-default source ~/prefix-3.8/setup_env.sh ....and that is all fine. Finally I installed gr-osmosdr: pybombs install gr-osmosdr but i have a problem: ... Clone in 'gr-iqbal' in corso... Configuring: (100%) [=========================================================] [WARNING] Configuration failed. Re-trying with higher verbosity. CMake Error at CMakeLists.txt:32 (find_package): Could not find a configuration file for package "Gnuradio" that is compatible with requested version "3.9". The following configuration files were considered but not accepted: /home/alberto/prefix-3.8/lib/cmake/gnuradio/GnuradioConfig.cmake, version: 3.8.3.git .... -- Configuring incomplete, errors occurred! See also "/home/alberto/prefix-3.8/src/gr-iqbal/build/CMakeFiles/CMakeOutput.log". [ERROR] Configuration failed after running at least twice. [ERROR] Problem occurred while building package gr-iqbal: Configuration failed [ERROR] Error installing package gr-iqbal. Aborting. alberto@alberto-Studio-XPS-1340:~$ How i can solve this problem ? tnx, Alberto Entire process: alberto@alberto-Studio-XPS-1340:~$ pybombs install gr-osmosdr [INFO] Prefix Python version is: 3.8.5 [INFO] PyBOMBS Version 2.3.4 [INFO] Phase 1: Creating install tree and installing binary packages: [INFO] Executing command with elevated privileges: `sudo -H apt-get -y install libhidapi-dev' [sudo] password di alberto: Lettura elenco dei pacchetti... Fatto Generazione albero delle dipendenze Lettura informazioni sullo stato... Fatto I seguenti pacchetti aggiuntivi saranno inoltre installati: libhidapi-hidraw0 libhidapi-libusb0 I seguenti pacchetti NUOVI saranno installati: libhidapi-dev libhidapi-hidraw0 libhidapi-libusb0 0 aggiornati, 3 installati, 0 da rimuovere e 11 non aggiornati. È necessario scaricare 47,8 kB di archivi. Dopo quest'operazione, verranno occupati 197 kB di spazio su disco. Scaricamento di:1 http://it.archive.ubuntu.com/ubuntu focal/universe amd64 libhidapi-libusb0 amd64 0.9.0+dfsg-1 [14,5 kB] Scaricamento di:2 http://it.archive.ubuntu.com/ubuntu focal/universe amd64 libhidapi-hidraw0 amd64 0.9.0+dfsg-1 [10,7 kB] Scaricamento di:3 http://it.archive.ubuntu.com/ubuntu focal/universe amd64 libhidapi-dev amd64 0.9.0+dfsg-1 [22,6 kB] Recuperati 47,8 kB in 0s (199 kB/s) Selezionato il pacchetto libhidapi-libusb0:amd64 non precedentemente selezionato. (Lettura del database... 228510 file e directory attualmente installati.) Preparativi per estrarre .../libhidapi-libusb0_0.9.0+dfsg-1_amd64.deb... Estrazione di libhidapi-libusb0:amd64 (0.9.0+dfsg-1)... Selezionato il pacchetto libhidapi-hidraw0:amd64 non precedentemente selezionato. Preparativi per estrarre .../libhidapi-hidraw0_0.9.0+dfsg-1_amd64.deb... Estrazione di libhidapi-hidraw0:amd64 (0.9.0+dfsg-1)... Selezionato il pacchetto libhidapi-dev:amd64 non precedentemente selezionato. Preparativi per estrarre .../libhidapi-dev_0.9.0+dfsg-1_amd64.deb... Estrazione di libhidapi-dev:amd64 (0.9.0+dfsg-1)... Configurazione di libhidapi-hidraw0:amd64 (0.9.0+dfsg-1)... Configurazione di libhidapi-libusb0:amd64 (0.9.0+dfsg-1)... Configurazione di libhidapi-dev:amd64 (0.9.0+dfsg-1)... Elaborazione dei trigger per libc-bin (2.31-0ubuntu9.2)... Install tree: | \- gr-osmosdr | +- airspy | +- airspyhf | +- osmo-sdr | +- rtl-sdr | +- bladeRF | +- soapysdr | +- gr-iqbal | | | \- libosmo-dsp | +- gr-fcdproplus | \- hackrf [INFO] Phase 1 complete: All binary dependencies installed. [INFO] Phase 2: Recursively installing source packages to prefix: [INFO] Installing package: hackrf warning: nessun commit in comune remote: Enumerating objects: 31, done. remote: Counting objects: 100% (31/31), done. remote: Compressing objects: 100% (29/29), done. remote: Total 14906 (delta 10), reused 16 (delta 2), pack-reused 14875 Ricezione degli oggetti: 100% (14906/14906), 35.98 MiB | 2.53 MiB/s, fatto. Risoluzione dei delta: 100% (10859/10859), fatto. Da https://github.com/mossmann/hackrf * [nuovo branch] OTP_USB_IDs -> hackrf/OTP_USB_IDs * [nuovo branch] grf6011 -> hackrf/grf6011 * [nuovo branch] h1r5 -> hackrf/h1r5 * [nuovo branch] h1r6 -> hackrf/h1r6 * [nuovo branch] h1r7 -> hackrf/h1r7 * [nuovo branch] master -> hackrf/master * [nuovo branch] pre-release -> hackrf/pre-release * [nuovo branch] stdout -> hackrf/stdout * [nuovo branch] transceiver -> hackrf/transceiver * [nuovo tag] 2013.06.1 -> 2013.06.1 * [nuovo tag] cft-milestone-1 -> cft-milestone-1 * [nuovo tag] jawbreaker-20120914 -> jawbreaker-20120914 * [nuovo tag] jawbreaker-20121016 -> jawbreaker-20121016 * [nuovo tag] v2013.07.1 -> v2013.07.1 * [nuovo tag] v2014.04.1 -> v2014.04.1 * [nuovo tag] v2014.08.1 -> v2014.08.1 * [nuovo tag] v2015.07.1 -> v2015.07.1 * [nuovo tag] v2015.07.2 -> v2015.07.2 * [nuovo tag] v2017.02.1 -> v2017.02.1 * [nuovo tag] v2018.01.1 -> v2018.01.1 * [nuovo tag] v2021.03.1 -> v2021.03.1 Clone in 'hackrf' in corso... Configuring: (100%) [=========================================================] Building: (100%) [=========================================================] Installing: (100%) [=========================================================] [INFO] Installation successful. [INFO] Installing package: gr-fcdproplus warning: nessun commit in comune remote: Enumerating objects: 5, done. remote: Counting objects: 100% (5/5), done. remote: Compressing objects: 100% (5/5), done. remote: Total 515 (delta 0), reused 5 (delta 0), pack-reused 510 Ricezione degli oggetti: 100% (515/515), 244.33 KiB | 919.00 KiB/s, fatto. Risoluzione dei delta: 100% (287/287), fatto. Da https://github.com/dl1ksv/gr-fcdproplus * [nuovo branch] 3.6 -> gr-fcdproplus/3.6 * [nuovo branch] gnuradio3.7 -> gr-fcdproplus/gnuradio3.7 * [nuovo branch] gnuradio3.8 -> gr-fcdproplus/gnuradio3.8 * [nuovo branch] hid-usb -> gr-fcdproplus/hid-usb * [nuovo branch] master -> gr-fcdproplus/master * [nuovo tag] fcdproplus-0.1.0 -> fcdproplus-0.1.0 * [nuovo tag] v3.6 -> v3.6 * [nuovo tag] v3.7 -> v3.7 * [nuovo tag] v3.7.12 -> v3.7.12 * [nuovo tag] v3.7.2-rc1 -> v3.7.2-rc1 * [nuovo tag] v3.7_hidraw -> v3.7_hidraw * [nuovo tag] with_hidapi -> with_hidapi Clone in 'gr-fcdproplus' in corso... Configuring: (100%) [=========================================================] Building: (100%) [=========================================================] Installing: (100%) [=========================================================] [INFO] Installation successful. [INFO] Installing package: libosmo-dsp Da https://git.osmocom.org/libosmo-dsp * [nuovo branch] master -> libosmo-dsp/master * [nuovo tag] 0.4.0 -> 0.4.0 * [nuovo tag] 0.3.0 -> 0.3.0 Clone in 'libosmo-dsp' in corso... Configuring: (100%) [=========================================================] Building: (100%) [=========================================================] Installing: (100%) [=========================================================] [INFO] Installation successful. [INFO] Installing package: gr-iqbal Da https://git.osmocom.org/gr-iqbal * [nuovo branch] gr3.6 -> gr-iqbal/gr3.6 * [nuovo branch] gr3.7 -> gr-iqbal/gr3.7 * [nuovo branch] gr3.8 -> gr-iqbal/gr3.8 * [nuovo branch] master -> gr-iqbal/master * [nuovo tag] v0.37.3 -> v0.37.3 * [nuovo tag] v0.38.2 -> v0.38.2 * [nuovo tag] v0.36.0 -> v0.36.0 * [nuovo tag] v0.37.0 -> v0.37.0 * [nuovo tag] v0.37.1 -> v0.37.1 * [nuovo tag] v0.37.2 -> v0.37.2 * [nuovo tag] v0.38.0 -> v0.38.0 * [nuovo tag] v0.38.1 -> v0.38.1 Clone in 'gr-iqbal' in corso... Configuring: (100%) [=========================================================] [WARNING] Configuration failed. Re-trying with higher verbosity. CMake Error at CMakeLists.txt:32 (find_package): Could not find a configuration file for package "Gnuradio" that is compatible with requested version "3.9". The following configuration files were considered but not accepted: /home/alberto/prefix-3.8/lib/cmake/gnuradio/GnuradioConfig.cmake, version: 3.8.3.git -- Configuring incomplete, errors occurred! See also "/home/alberto/prefix-3.8/src/gr-iqbal/build/CMakeFiles/CMakeOutput.log". [ERROR] Configuration failed after running at least twice. [ERROR] Problem occurred while building package gr-iqbal: Configuration failed [ERROR] Error installing package gr-iqbal. Aborting. alberto@alberto-Studio-XPS-1340:~$

2 3

Improving the frequency precision of R820T dongles
by radio＠aijk.org 28 Mar '21

28 Mar '21

Hello, To avoid confusion, this post is about frequency errors inherent in the dongle hardware, which is quite separate from crystal drift. Having noticed that some dongles have impressive frequency stability, I did some calibration tests, and discovered (as I should have known) that the limited number length of the dongle hardware tunes to only an approximation of the requested frequency. In extreme cases the frequency error, i.e. the difference between the actual frequency and the requested frequency, can be as much as 1 ppm. To get around this limitation, I added an experimental function to librtlsdr.c that returns the *exact* frequency that the dongle is tuned to. It does this by reading internal registers, and working backwards to compute the frequency. Software that makes use of the added function can expect 1 to 2 orders of magnitude improvement in precision, when a dongle is calibrated at one frequency and then tuned to other frequencies. If people here are interested in this work, please let me know where I can post details, preferably including the occasional graph and table. Ian

1 0

gr-osmosdr: add clock_source= parameter
by Michael Loeffler 26 Mar '21

26 Mar '21

Hello, the attached patch allows to set the clock_source on uhd devices in programs like gqrx. Bye

1 1

Idea for 2021: Regular "OsmoDevCall"
by Harald Welte 25 Mar '21

25 Mar '21

Dear Osmocom community, as the pandemic continues and physical meetings are out of the question for the forseeable future, it would be a good idea to have a periodic virtual online meeting of the interested Osmocom community. I was thinking of a format where we would serve two major purposes: 1) technical talks about osmocom relevant topics - ideally current/recent developments * can be pre-recorded to avoid any problems with technical setup, streaming, ... * should ideally have a Q+A session at their initial "airing" during one OsmoDevCall 2) unstructured solicited social event (USSE) * random chat in audio (optionally video) * not recorded, obviously The recording of the technical presentation should then be permanently made available (like the presentations of our prior OsmoCon / OsmoDevCon). Not every OsmoDevCall would neccessarily need the two parts, but I think it would be great if we can make that happen. We could also have e.g. a two-weekly schedule for the USSE and a monthly schedule for the technical presentation. We'd need somebody to volunteer to "manage" the "broadcast" side of this, preferably somebody with at least some prior exposure to online events (like the c3voc). I'm using https://osmocom.org/issues/4928 to collect a tentative list of topics. Feel free to add your ideas there, as well as any comment/ feedback you may have. Regards, Harald -- - Harald Welte <laforge(a)osmocom.org> http://laforge.gnumonks.org/ ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6)

1 4

Re: Announcement of "OsmoDevCall"
by Harald Welte 03 Mar '21

03 Mar '21

Hi Garret, On Fri, Feb 26, 2021 at 09:44:53PM +0000, Garrett wrote: > Thanks for tonight, was very informative happy to hear. > If its not to0 late to add stuff to the agenda I would love to > hear of any progress on sysmoOCTSIM and the various breakout boards for > M.2 modems. sysmoOCTSIM is a sysmocom product (proprietary hardware with open source firmware on the SAM3 controllers for sim card emulation), so I'm normally against "advertising" that too much in the context of Osmocom, which is an open source project. Talks about the osmo-remsim or the SIMtrace2 firmware (both open source projects) are fine, and of course they can mention compatible hardware like the sysmoOCTSIM, but only as a side-note. There's already "osmo-remsim in practice" already on the list of topics. The modem break-out boards, or in fact all of the various Osmocom OSHW projects (like SFP breakout, SFP experimenter, ...) would of course make useful additions. I've added the following entries to https://osmocom.org/projects/osmo-dev-con/wiki/OsmoDevCall#Future * "mPCIe and M.2/ngff modem breakout boards" * "SFP experimenter and SFP breakout boards" Regards, Harald -- - Harald Welte <laforge(a)gnumonks.org> http://laforge.gnumonks.org/ ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6)

1 0

FUNcube Dongle V1.0 not working with osmocom Source
by Dennis Real 28 Feb '21

28 Feb '21

Hi, I´m trying to get my FUNcube Dongle (V1.O NOT the Pro+) to work on Ubuntu 20.04.1 LTS but it doesn´t work. On a rasberry pi4 (Raspbian 10) the dongle is working in gnuradio-companion together with the osmocom-source. So the hardware seems to work. On Ubuntu I get following errors: 1. Gnuradio-companion as "osmocom Source" with device string "fcd=0": Executing: /usr/bin/python3 -u /home/reald/grc/osmocomsrc_fcd.py gr-osmosdr 0.2.0.0 (0.2.0) gnuradio 3.8.1.0 built-in source types: file osmosdr fcd rtl rtl_tcp uhd miri hackrf bladerf rfspace airspy airspyhf soapy redpitaya freesrp Using FUNcube Dongle V1.0 (hw:2) gr::log :INFO: audio source - Audio source arch: alsa gr::log :INFO: fcd0 - Audio device hw:2 opened gr::log :INFO: fcd_control0 - FunCube Dongle V1.0 initialized. gr::log :INFO: fcd_control0 - Dongle: FCDAPP 18.10 gr::log :INFO: fcd_control0 - LNA gain set to: 20 Traceback (most recent call last): File "/home/reald/grc/osmocomsrc_fcd.py", line 275, in <module> main() File "/home/reald/grc/osmocomsrc_fcd.py", line 253, in main tb = top_block_cls() File "/home/reald/grc/osmocomsrc_fcd.py", line 145, in __init__ self.osmosdr_source_0 = osmosdr.source( File "/usr/lib/python3/dist-packages/osmosdr/osmosdr_swig.py", line 1074, in make return _osmosdr_swig.source_make(*args, **kwargs) RuntimeError: boost::too_many_args: format-string referred to fewer arguments than were passed >>> Done (return code 1) 2. GQRX When configuring gqrx the dongle is listed. But after every start of gqrx the message "boost::too_many_args: format-string referred to fewer arguments then were passed - Please select another device" appears and the dongle cannot be used. 3. osmocom_fft -a fcd=0 gr-osmosdr 0.2.0.0 (0.2.0) gnuradio 3.8.1.0 built-in source types: file osmosdr fcd rtl rtl_tcp uhd miri hackrf bladerf rfspace airspy airspyhf soapy redpitaya freesrp Using FUNcube Dongle V1.0 (hw:2) gr::log :INFO: audio source - Audio source arch: alsa gr::log :INFO: fcd0 - Audio device hw:2 opened gr::log :INFO: fcd_control0 - FunCube Dongle V1.0 initialized. gr::log :INFO: fcd_control0 - Dongle: FCDAPP 18.10 gr::log :INFO: fcd_control0 - LNA gain set to: 20 Couldn't instanciate source (no device present?). The device itself is found: $ lsusb Bus 001 Device 009: ID 04d8:fb56 Microchip Technology, Inc. FUNcube Dongle V1.0 $ dmesg [10627.256845] usb 1-9: new full-speed USB device number 9 using xhci_hcd [10627.408263] usb 1-9: New USB device found, idVendor=04d8, idProduct=fb56, bcdDevice= 0.02 [10627.408268] usb 1-9: New USB device strings: Mfr=1, Product=2, SerialNumber=0 [10627.408272] usb 1-9: Product: FUNcube Dongle V1.0 [10627.408275] usb 1-9: Manufacturer: Hanlincrest Ltd. [10627.416513] hid-generic 0003:04D8:FB56.0007: hiddev1,hidraw3: USB HID v1.11 Device [Hanlincrest Ltd. FUNcube Dongle V1.0 ] on usb-0000:00:14.0-9/input2 [10627.849214] usb 1-5.1.1: reset high-speed USB device number 8 using xhci_hcd [10628.703275] parport0: no more devices allowed [10628.703283] ppdev0: failed to register device! Package: gr-osmosdr Version: 0.2.0-2 Package: libosmosdr0 Version: 0.1.8.effcaa7-7 Any ideas? Thanks for your help! Regards Dennis

2 1

Support on a RTL_SDR Receiver R820T2 USB Tuner 100KHz-1 7GHz UV HF
by jarrod emery 28 Feb '21

28 Feb '21

Hi Guys….. Um im far from an expert at all this, I hardly even know what this device is capable of doing.. but I bought one because they sound very interesting if you know what you doing, what you can tune into etc… But I have run into some trouble.. I bought a RTL_SDR Receiver R820T2 USB Tuner 100KHz-1 7GHz UV HF… I have a Mac OS running MoJave version10.14.6 (18G103). I downloaded CubicSDR, it installed perfectly.. the trouble I’m having is the software not picking up my Tuner.. well it does pick it up after a few minutes, but its like its not throwing enough power to keep a stable connection to CubicSDR.. What can I do to fix this? Is there anything at all I can do to fix this pretty easily? Or is it very hard? Or do I have to buy more parts etc?? Can you please let me know so I know if its just a waste of space lol… Cheers, Regards Jarrod

2 1

[PATCH 2/2] Remove Doxygen warnings.
by Ron Economos 28 Jan '21

28 Jan '21

Signed-off-by: Ron Economos <w6rz(a)comcast.net> --- include/osmosdr/source.h | 1 + lib/sink_iface.h | 1 + lib/source_iface.h | 2 ++ python/bindings/python_bindings.cc | 12 ++++++------ python/bindings/source_python.cc | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/include/osmosdr/source.h b/include/osmosdr/source.h index 3ea716d..20c77b1 100644 --- a/include/osmosdr/source.h +++ b/include/osmosdr/source.h @@ -63,6 +63,7 @@ public: * * \param seek_point sample offset in file * \param whence one of SEEK_SET, SEEK_CUR, SEEK_END (man fseek) + * \param chan the channel index 0 to N-1 * \return true on success */ virtual bool seek( long seek_point, int whence, size_t chan = 0 ) = 0; diff --git a/lib/sink_iface.h b/lib/sink_iface.h index 39aabc7..15ea952 100644 --- a/lib/sink_iface.h +++ b/lib/sink_iface.h @@ -201,6 +201,7 @@ public: /*! * Select the active antenna of the underlying radio hardware. + * \param antenna the antenna name * \param chan the channel index 0 to N-1 * \return the actual antenna's name */ diff --git a/lib/source_iface.h b/lib/source_iface.h index abb70eb..14f05bb 100644 --- a/lib/source_iface.h +++ b/lib/source_iface.h @@ -43,6 +43,7 @@ public: * * \param seek_point sample offset in file * \param whence one of SEEK_SET, SEEK_CUR, SEEK_END (man fseek) + * \param chan the channel index 0 to N-1 * \return true on success */ virtual bool seek( long seek_point, int whence, size_t chan = 0 ) { return false; } @@ -210,6 +211,7 @@ public: /*! * Select the active antenna of the underlying radio hardware. + * \param antenna the antenna name * \param chan the channel index 0 to N-1 * \return the actual antenna's name */ diff --git a/python/bindings/python_bindings.cc b/python/bindings/python_bindings.cc index 7204b2b..428417d 100644 --- a/python/bindings/python_bindings.cc +++ b/python/bindings/python_bindings.cc @@ -16,9 +16,9 @@ namespace py = pybind11; // Headers for binding functions /**************************************/ -/* The following comment block is used for -/* gr_modtool to insert function prototypes -/* Please do not delete +// The following comment block is used for +// gr_modtool to insert function prototypes +// Please do not delete /**************************************/ // BINDING_FUNCTION_PROTOTYPES( void bind_sink(py::module& m); @@ -50,9 +50,9 @@ PYBIND11_MODULE(osmosdr_python, m) py::module::import("gnuradio.gr"); /**************************************/ - /* The following comment block is used for - /* gr_modtool to insert binding function calls - /* Please do not delete + // The following comment block is used for + // gr_modtool to insert binding function calls + // Please do not delete /**************************************/ // BINDING_FUNCTION_CALLS( bind_sink(m); diff --git a/python/bindings/source_python.cc b/python/bindings/source_python.cc index 48bf10c..0cab394 100644 --- a/python/bindings/source_python.cc +++ b/python/bindings/source_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(1) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(source.h) */ -/* BINDTOOL_HEADER_FILE_HASH(574373c3c7682569b0fd7eea577739da) */ +/* BINDTOOL_HEADER_FILE_HASH(d1a3d9ea3d815fe4f18acc3eef21f1b6) */ /***********************************************************************************/ #include <pybind11/complex.h> -- 2.17.1

1 0

[PATCH 1/2] Remove CMake warnings.
by Ron Economos 28 Jan '21

28 Jan '21

Signed-off-by: Ron Economos <w6rz(a)comcast.net> --- CMakeLists.txt | 3 ++- cmake/Modules/FindLibAIRSPY.cmake | 6 ++++-- cmake/Modules/FindLibAIRSPYHF.cmake | 6 ++++-- cmake/Modules/FindLibHackRF.cmake | 6 ++++-- lib/CMakeLists.txt | 2 +- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b4bb535..96a2c90 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,8 +21,8 @@ # Project setup ######################################################################## cmake_minimum_required(VERSION 3.8) -include(GNUInstallDirs) project(gr-osmosdr CXX C) +include(GNUInstallDirs) enable_testing() #policy setup @@ -41,6 +41,7 @@ set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "") list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules) # Find GNURadio (pmt and runtime are core, always included) +include(FindPkgConfig) find_package(Gnuradio "3.9" REQUIRED COMPONENTS blocks fft filter) # Set the version information here diff --git a/cmake/Modules/FindLibAIRSPY.cmake b/cmake/Modules/FindLibAIRSPY.cmake index 221edcc..437adc4 100644 --- a/cmake/Modules/FindLibAIRSPY.cmake +++ b/cmake/Modules/FindLibAIRSPY.cmake @@ -1,4 +1,6 @@ -INCLUDE(FindPkgConfig) +if(NOT PKG_CONFIG_FOUND) + INCLUDE(FindPkgConfig) +endif() PKG_CHECK_MODULES(PC_LIBAIRSPY libairspy) FIND_PATH( @@ -20,5 +22,5 @@ FIND_LIBRARY( ) INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBAIRSPY DEFAULT_MSG LIBAIRSPY_LIBRARIES LIBAIRSPY_INCLUDE_DIRS) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibAIRSPY DEFAULT_MSG LIBAIRSPY_LIBRARIES LIBAIRSPY_INCLUDE_DIRS) MARK_AS_ADVANCED(LIBAIRSPY_LIBRARIES LIBAIRSPY_INCLUDE_DIRS) diff --git a/cmake/Modules/FindLibAIRSPYHF.cmake b/cmake/Modules/FindLibAIRSPYHF.cmake index edb0dda..8c06128 100644 --- a/cmake/Modules/FindLibAIRSPYHF.cmake +++ b/cmake/Modules/FindLibAIRSPYHF.cmake @@ -1,4 +1,6 @@ -INCLUDE(FindPkgConfig) +if(NOT PKG_CONFIG_FOUND) + INCLUDE(FindPkgConfig) +endif() PKG_CHECK_MODULES(PC_LIBAIRSPYHF libairspyhf) FIND_PATH( @@ -20,5 +22,5 @@ FIND_LIBRARY( ) INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBAIRSPYHF DEFAULT_MSG LIBAIRSPYHF_LIBRARIES LIBAIRSPYHF_INCLUDE_DIRS) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibAIRSPYHF DEFAULT_MSG LIBAIRSPYHF_LIBRARIES LIBAIRSPYHF_INCLUDE_DIRS) MARK_AS_ADVANCED(LIBAIRSPYHF_LIBRARIES LIBAIRSPYHF_INCLUDE_DIRS) diff --git a/cmake/Modules/FindLibHackRF.cmake b/cmake/Modules/FindLibHackRF.cmake index a0d57ef..bc2bc3e 100644 --- a/cmake/Modules/FindLibHackRF.cmake +++ b/cmake/Modules/FindLibHackRF.cmake @@ -1,4 +1,6 @@ -INCLUDE(FindPkgConfig) +if(NOT PKG_CONFIG_FOUND) + INCLUDE(FindPkgConfig) +endif() PKG_CHECK_MODULES(PC_LIBHACKRF libhackrf) FIND_PATH( @@ -20,6 +22,6 @@ FIND_LIBRARY( ) INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBHACKRF DEFAULT_MSG LIBHACKRF_LIBRARIES LIBHACKRF_INCLUDE_DIRS) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibHackRF DEFAULT_MSG LIBHACKRF_LIBRARIES LIBHACKRF_INCLUDE_DIRS) MARK_AS_ADVANCED(LIBHACKRF_LIBRARIES LIBHACKRF_INCLUDE_DIRS) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 1bb8655..c7cfec3 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -44,7 +44,7 @@ endif() #this appends all unnamed implicit macro args! MACRO (APPEND_LIB_LIST) SET (gr_osmosdr_libs "${gr_osmosdr_libs};${ARGN}" CACHE INTERNAL "lib list") -ENDMACRO (APPEND_INTERNAL_LIST) +ENDMACRO (APPEND_LIB_LIST) set(gr_osmosdr_libs "" CACHE INTERNAL "lib that accumulates link targets") -- 2.17.1

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
92
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

osmocom-sdr