sdr/gr-fosphor
sdr
/
gr-fosphor
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gr-fosphor/cmake: Switch to the new recommended GnuradioConfig 

Rather than using our own copy of FindGnuradioRuntine

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
This commit is contained in:
Sylvain Munaut 2013-11-10 16:51:43 +01:00
parent 8378696eea
commit 3779600868
4 changed files with 5 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -120,10 +120,8 @@ endif (QT_FOUND)
########################################################################
# Find gnuradio build dependencies
########################################################################
find_package(GnuradioRuntime)
if(NOT GNURADIO_RUNTIME_FOUND)
message(FATAL_ERROR "GnuRadio Runtime required to compile gr-fosphor")
endif()
set(GR_REQUIRED_COMPONENTS RUNTIME)
find_package(Gnuradio 3.7 REQUIRED)
find_package(CppUnit)
if(NOT CPPUNIT_FOUND)
@ -171,13 +169,12 @@ include_directories(
${CMAKE_SOURCE_DIR}/include
${Boost_INCLUDE_DIRS}
${CPPUNIT_INCLUDE_DIRS}
${GNURADIO_RUNTIME_INCLUDE_DIRS}
${GNURADIO_ALL_INCLUDE_DIRS}
)
link_directories(
${Boost_LIBRARY_DIRS}
${CPPUNIT_LIBRARY_DIRS}
${GNURADIO_RUNTIME_LIBRARY_DIRS}
)
# Set component parameters

51
cmake/Modules/FindGnuradioRuntime.cmake
View File

@ -1,51 +0,0 @@
if(NOT GNURADIO_RUNTIME_FOUND)
INCLUDE(FindPkgConfig)
PKG_CHECK_MODULES(PC_GNURADIO_RUNTIME gnuradio-runtime)
# look for include files
FIND_PATH(
GNURADIO_RUNTIME_INCLUDE_DIRS
NAMES gnuradio/top_block.h
HINTS $ENV{GNURADIO_RUNTIME_DIR}/include
${PC_GNURADIO_RUNTIME_INCLUDE_DIRS}
${CMAKE_INSTALL_PREFIX}/include
PATHS /usr/local/include
/usr/include
)
if(NOT PC_GNURADIO_RUNTIME_FOUND)
set(PC_GNURADIO_RUNTIME_LIBRARIES gnuradio-runtime)
endif(NOT PC_GNURADIO_RUNTIME_FOUND)
foreach(libname ${PC_GNURADIO_RUNTIME_LIBRARIES})
# look for libs
FIND_LIBRARY(
GNURADIO_RUNTIME_LIBRARIES_${libname}
NAMES ${libname}
HINTS $ENV{GNURADIO_RUNTIME_DIR}/lib
${PC_GNURADIO_RUNTIME_LIBDIR}
${CMAKE_INSTALL_PREFIX}/lib/
${CMAKE_INSTALL_PREFIX}/lib64/
PATHS /usr/local/lib
/usr/local/lib64
/usr/lib
/usr/lib64
)
list(APPEND GNURADIO_RUNTIME_LIBRARIES ${GNURADIO_RUNTIME_LIBRARIES_${libname}})
endforeach(libname)
set (GNURADIO_RUNTIME_LIBRARIES ${GNURADIO_RUNTIME_LIBRARIES} CACHE FILEPATH "gnuradio-runtime libraries")
if (GNURADIO_RUNTIME_INCLUDE_DIRS AND GNURADIO_RUNTIME_LIBRARIES)
set(GNURADIO_RUNTIME_FOUND TRUE CACHE INTERNAL "gnuradio-runtime found")
else (GNURADIO_RUNTIME_INCLUDE_DIRS AND GNURADIO_RUNTIME_LIBRARIES)
set(GNURADIO_RUNTIME_FOUND FALSE CACHE INTERNAL "gnuradio-runtime found")
endif(GNURADIO_RUNTIME_INCLUDE_DIRS AND GNURADIO_RUNTIME_LIBRARIES)
INCLUDE(FindPackageHandleStandardArgs)
# do not check GNURADIO_RUNTIME_INCLUDE_DIRS, is not set when default include path us used.
FIND_PACKAGE_HANDLE_STANDARD_ARGS(GNURADIO_RUNTIME DEFAULT_MSG GNURADIO_RUNTIME_LIBRARIES)
MARK_AS_ADVANCED(GNURADIO_RUNTIME_LIBRARIES GNURADIO_RUNTIME_INCLUDE_DIRS)
endif(NOT GNURADIO_RUNTIME_FOUND)

2
lib/CMakeLists.txt
View File

@ -84,7 +84,7 @@ list(APPEND fosphor_libraries
${OPENCL_LIBRARIES}
${FREETYPE2_LIBRARIES}
${Boost_LIBRARIES}
${GNURADIO_RUNTIME_LIBRARIES}
${GNURADIO_ALL_LIBRARIES}
)
list_cond_append(ENABLE_PYTHON fosphor_libraries ${PYTHON_LIBRARY})

2
swig/CMakeLists.txt
View File

@ -31,7 +31,7 @@ include(GrPython)
########################################################################
# Setup swig generation
########################################################################
foreach(incdir ${GNURADIO_RUNTIME_INCLUDE_DIRS})
foreach(incdir ${GNURADIO_ALL_INCLUDE_DIRS})
list(APPEND GR_SWIG_INCLUDE_DIRS ${incdir}/gnuradio/swig)
endforeach(incdir)