diff options
| author | Tim O'Shea <tim.oshea753@gmail.com> | 2013-04-15 11:32:19 -0400 |
|---|---|---|
| committer | Tim O'Shea <tim.oshea753@gmail.com> | 2013-04-18 14:47:59 -0400 |
| commit | b1d56fec6719551324db74562792b53fbcfe6f29 (patch) | |
| tree | d250d0bd1d82ec42b1e3525b27b61f80b6e0cbe4 /cmake | |
| parent | 7f848f77e9130f7df6500e736407f3da886d5eec (diff) | |
update FindGnuradio.cmake to use the standard method for libgnuradio-pmt
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/FindGnuradio.cmake | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/cmake/Modules/FindGnuradio.cmake b/cmake/Modules/FindGnuradio.cmake index dc4028bcd1..80be72dc8c 100644 --- a/cmake/Modules/FindGnuradio.cmake +++ b/cmake/Modules/FindGnuradio.cmake @@ -6,7 +6,7 @@ INCLUDE(FindPackageHandleStandardArgs) # if GR_REQUIRED_MODULES is not defined, it will be set to the following list (all of them)
if(NOT GR_REQUIRED_MODULES)
- set(GR_REQUIRED_MODULES RUNTIME ANALOG ATSC AUDIO BLOCKS CHANNELS DIGITAL FEC FFT FILTER NOAA PAGER QTGUI TRELLIS UHD VOCODER WAVELET)
+ set(GR_REQUIRED_MODULES RUNTIME ANALOG ATSC AUDIO BLOCKS CHANNELS DIGITAL FEC FFT FILTER NOAA PAGER QTGUI TRELLIS UHD VOCODER WAVELET PMT)
endif()
set(GNURADIO_ALL_LIBRARIES "")
@@ -103,21 +103,6 @@ GR_MODULE(TRELLIS gnuradio-trellis trellis/fsm.h gnuradio-trellis) GR_MODULE(UHD gnuradio-uhd gr_uhd/usrp_sink.h gnuradio-uhd)
GR_MODULE(VOCODER gnuradio-vocoder vocoder/alaw_encode_sb.h gnuradio-vocoder)
GR_MODULE(WAVELET gnuradio-wavelet wavelet/wavelet_ff.h gnuradio-wavelet)
+GR_MODULE(PMT gnuradio-pmt pmt/pmt.h gnuradio-pmt)
-# Check for PMT Library
-FIND_PATH(
- PMT_INCLUDE_DIRS
- NAMES pmt/pmt.h
- HINTS $ENV{PMT_DIR}/include
- ${PC_PMT_INCLUDEDIR}
- ${CMAKE_INSTALL_PREFIX}/include
- PATHS /usr/local/include
- /usr/include
-)
-MARK_AS_ADVANCED(PMT_INCLUDE_DIRS)
-if(PMT_INCLUDE_DIRS)
- message(STATUS "PMT includes in ${PMT_INCLUDE_DIRS}")
-else()
- message(FATAL "Could not find PMT includes!")
-endif()
|