diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-05-07 19:52:06 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-05-07 19:52:06 -0400 |
| commit | 52f00c66ab55327cfe6fc8b72cc1397a8f39c0cb (patch) | |
| tree | f209b6904a37e4385cb915791a2c2f9feb6cd9ca /cmake | |
| parent | e8f6598bab89c67c0e9f4dea1d73954a69af071f (diff) | |
build: updated config cmake file for next changes.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/GnuradioConfig.cmake | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/cmake/Modules/GnuradioConfig.cmake b/cmake/Modules/GnuradioConfig.cmake index 9434f08ef4..a2e6996220 100644 --- a/cmake/Modules/GnuradioConfig.cmake +++ b/cmake/Modules/GnuradioConfig.cmake @@ -22,7 +22,7 @@ INCLUDE(FindPackageHandleStandardArgs) # if GR_REQUIRED_COMPONENTS is not defined, it will be set to the following list (all of them)
if(NOT GR_REQUIRED_COMPONENTS)
- set(GR_REQUIRED_COMPONENTS CORE RUNTIME ANALOG ATSC AUDIO BLOCKS CHANNELS DIGITAL FCD FEC FFT FILTER NOAA PAGER QTGUI TRELLIS UHD VOCODER WAVELET WXGUI)
+ set(GR_REQUIRED_COMPONENTS RUNTIME ANALOG ATSC AUDIO BLOCKS CHANNELS DIGITAL FCD FEC FFT FILTER NOAA PAGER QTGUI TRELLIS UHD VOCODER WAVELET WXGUI)
endif()
set(GNURADIO_ALL_LIBRARIES "")
@@ -59,8 +59,7 @@ function(GR_MODULE EXTVAR PCNAME INCFILE LIBFILE) FIND_PATH(
${INCVAR_NAME}
NAMES ${INCFILE}
- HINTS $ENV{GNURADIO_CORE_DIR}/include/gnuradio
- ${PC_INCDIR}
+ HINTS $ENV{GNURADIO_RUNTIME_DIR}/include/gnuradio
${PC_INCDIR}/gnuradio/
${CMAKE_INSTALL_PREFIX}/include/gnuradio
PATHS /usr/local/include/gnuradio
@@ -71,7 +70,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/
@@ -102,8 +101,7 @@ function(GR_MODULE EXTVAR PCNAME INCFILE LIBFILE) endfunction()
-GR_MODULE(CORE gnuradio-core gr_top_block.h gnuradio-core)
-GR_MODULE(RUNTIME gnuradio-core gr_top_block.h gnuradio-core)
+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)
GR_MODULE(AUDIO gnuradio-audio audio/sink.h gnuradio-audio)
|