diff options
| author | Tim O'Shea <tim.oshea753@gmail.com> | 2013-03-27 16:46:11 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-27 17:01:30 -0400 |
| commit | cfa78b7708faf1f112e9be8dd8bc146bd27899f8 (patch) | |
| tree | d8e70160d0efaed0f83d230df7a33dbfaa86ee8b /cmake | |
| parent | 2bee18d6004151d95ddfc37f928d0e5bc59bd089 (diff) | |
updates to FindGnuradio.cmake for core->runtime rename
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/FindGnuradio.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cmake/Modules/FindGnuradio.cmake b/cmake/Modules/FindGnuradio.cmake index bf54b9589c..bd45a95819 100644 --- a/cmake/Modules/FindGnuradio.cmake +++ b/cmake/Modules/FindGnuradio.cmake @@ -2,11 +2,11 @@ INCLUDE(FindPkgConfig) INCLUDE(FindPackageHandleStandardArgs)
# a subset of required modules can be set using the following syntax
-#set(GR_REQUIRED_MODULES CORE BLOCKS)
+#set(GR_REQUIRED_MODULES RUNTIME BLOCKS)
# 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 CORE 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)
endif()
set(GNURADIO_ALL_LIBRARIES "")
@@ -43,7 +43,7 @@ function(GR_MODULE EXTVAR PCNAME INCFILE LIBFILE) FIND_PATH(
${INCVAR_NAME}
NAMES ${INCFILE}
- HINTS $ENV{GNURADIO_CORE_DIR}/include/gnuradio
+ HINTS $ENV{GNURADIO_RUNTIME_DIR}/include/gnuradio
${PC_INCDIR}
${CMAKE_INSTALL_PREFIX}/include/gnuradio
PATHS /usr/local/include/gnuradio
@@ -54,7 +54,7 @@ function(GR_MODULE EXTVAR PCNAME INCFILE LIBFILE) FIND_LIBRARY(
${LIBVAR_NAME}
NAMES ${LIBFILE}
- HINTS $ENV{GNURADIO_CORE_DIR}/lib
+ HINTS $ENV{GNURADIO_RUNTIME_DIR}/lib
${PC_LIBDIR}
${CMAKE_INSTALL_PREFIX}/lib/
${CMAKE_INSTALL_PREFIX}/lib64/
@@ -85,7 +85,7 @@ function(GR_MODULE EXTVAR PCNAME INCFILE LIBFILE) endfunction()
-GR_MODULE(CORE gnuradio-core gr_top_block.h gnuradio-core)
+GR_MODULE(CORE gnuradio-runtime gr_top_block.h gnuradio-runtime)
GR_MODULE(RUNTIME gnuradio-runtime gr_top_block.h gnuradio-runtime)
GR_MODULE(ANALOG gnuradio-analog analog/noise_type.h gnuradio-analog)
GR_MODULE(ATSC gnuradio-atsc atsc_api.h gnuradio-atsc)
|