diff options
author | Johnathan Corgan | 2012-02-14 12:32:52 -0800 |
---|---|---|
committer | Johnathan Corgan | 2012-02-14 12:34:47 -0800 |
commit | f0a1631dad755d5abf28351f07b2bbf7773b37b8 (patch) | |
tree | 397b02568ddbab1f85646afdd06aee6fd540c99c /gr-noaa | |
parent | ef1748e4efc40cc065fb5f1b40d710256dd37efa (diff) | |
parent | dc266ca38bdc59955f8c8d8a98291f078d7f4377 (diff) | |
download | gnuradio-f0a1631dad755d5abf28351f07b2bbf7773b37b8.tar.gz gnuradio-f0a1631dad755d5abf28351f07b2bbf7773b37b8.tar.bz2 gnuradio-f0a1631dad755d5abf28351f07b2bbf7773b37b8.zip |
Merge branch 'master' into safe_align
Conflicts:
gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc
gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc
Diffstat (limited to 'gr-noaa')
-rw-r--r-- | gr-noaa/CMakeLists.txt | 14 | ||||
-rw-r--r-- | gr-noaa/Makefile.am | 2 | ||||
-rw-r--r-- | gr-noaa/gnuradio-noaa.pc.in | 11 |
3 files changed, 27 insertions, 0 deletions
diff --git a/gr-noaa/CMakeLists.txt b/gr-noaa/CMakeLists.txt index 621dd5d6e..a3a5d56db 100644 --- a/gr-noaa/CMakeLists.txt +++ b/gr-noaa/CMakeLists.txt @@ -84,4 +84,18 @@ if(ENABLE_PYTHON) add_subdirectory(apps) endif(ENABLE_PYTHON) +######################################################################## +# Create Pkg Config File +######################################################################## +configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/gnuradio-noaa.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-noaa.pc +@ONLY) + +install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/gnuradio-noaa.pc + DESTINATION ${GR_LIBRARY_DIR}/pkgconfig + COMPONENT "noaa_devel" +) + endif(ENABLE_GR_NOAA) diff --git a/gr-noaa/Makefile.am b/gr-noaa/Makefile.am index 854ce1476..ce5f66109 100644 --- a/gr-noaa/Makefile.am +++ b/gr-noaa/Makefile.am @@ -27,3 +27,5 @@ if PYTHON SUBDIRS += swig python apps endif +pkgconfigdir = $(libdir)/pkgconfig +dist_pkgconfig_DATA = gnuradio-noaa.pc diff --git a/gr-noaa/gnuradio-noaa.pc.in b/gr-noaa/gnuradio-noaa.pc.in new file mode 100644 index 000000000..cacfeecca --- /dev/null +++ b/gr-noaa/gnuradio-noaa.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: gnuradio-noaa +Description: GNU Radio blocks implementing a NOAA satellite protocols +Requires: gnuradio-core +Version: @LIBVER@ +Libs: -L${libdir} -lgnuradio-noaa +Cflags: -I${includedir} |