t/gr-foo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more updates

Browse Source
This commit is contained in:
Bastian Bloessl
2019-03-08 12:38:20 +00:00
parent 284a0b1fa5
commit 8360cae375
3 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+8 -6
View File
@@ -72,8 +72,7 @@ endif()
######################################################################## ########################################################################
# Install directories # Install directories
######################################################################## ########################################################################
set(GR_REQUIRED_COMPONENTS RUNTIME PMT BLOCKS FILTER ANALOG) find_package(Gnuradio "3.8" REQUIRED COMPONENTS blocks analog filter fft)
find_package(Gnuradio "3.8" REQUIRED)
include(GrVersion) include(GrVersion)
include(GrPlatform) #define LIB_SUFFIX include(GrPlatform) #define LIB_SUFFIX
@@ -136,14 +135,17 @@ add_subdirectory(include/foo)
add_subdirectory(lib) add_subdirectory(lib)
add_subdirectory(swig) add_subdirectory(swig)
add_subdirectory(python) add_subdirectory(python)
if(ENABLE_GRC) add_subdirectory(grc)
add_subdirectory(grc)
endif(ENABLE_GRC)
######################################################################## ########################################################################
# Install cmake search helper for this library # Install cmake search helper for this library
######################################################################## ########################################################################
install(FILES cmake/Modules/fooConfig.cmake configure_file(
${CMAKE_SOURCE_DIR}/cmake/Modules/fooConfig.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/fooConfig.cmake
@ONLY)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fooConfig.cmake
DESTINATION ${CMAKE_MODULES_DIR}/foo DESTINATION ${CMAKE_MODULES_DIR}/foo
) )
cmake/Modules/fooConfig.cmake → cmake/Modules/fooConfig.cmake.in
+15 -10
View File
@@ -6,9 +6,11 @@ FIND_PATH(
NAMES foo/api.h NAMES foo/api.h
HINTS $ENV{FOO_DIR}/include HINTS $ENV{FOO_DIR}/include
${PC_FOO_INCLUDEDIR} ${PC_FOO_INCLUDEDIR}
PATHS ${CMAKE_INSTALL_PREFIX}/include PATHS
/usr/local/include @CMAKE_INSTALL_PREFIX@/include
/usr/include ${CMAKE_INSTALL_PREFIX}/include
/usr/local/include
/usr/include
) )
FIND_LIBRARY( FIND_LIBRARY(
@@ -16,13 +18,16 @@ FIND_LIBRARY(
NAMES gnuradio-foo NAMES gnuradio-foo
HINTS $ENV{FOO_DIR}/lib HINTS $ENV{FOO_DIR}/lib
${PC_FOO_LIBDIR} ${PC_FOO_LIBDIR}
PATHS ${CMAKE_INSTALL_PREFIX}/lib PATHS
${CMAKE_INSTALL_PREFIX}/lib64 @CMAKE_INSTALL_PREFIX@/lib
/usr/local/lib @CMAKE_INSTALL_PREFIX@/lib64
/usr/local/lib64 ${CMAKE_INSTALL_PREFIX}/lib
/usr/lib ${CMAKE_INSTALL_PREFIX}/lib64
/usr/lib64 /usr/local/lib
) /usr/local/lib64
/usr/lib
/usr/lib64
)
include("${CMAKE_CURRENT_LIST_DIR}/fooTarget.cmake") include("${CMAKE_CURRENT_LIST_DIR}/fooTarget.cmake")
lib/CMakeLists.txt
+7 -1
View File
@@ -50,7 +50,13 @@ if(NOT foo_sources)
endif(NOT foo_sources) endif(NOT foo_sources)
add_library(gnuradio-foo SHARED ${foo_sources}) add_library(gnuradio-foo SHARED ${foo_sources})
target_link_libraries(gnuradio-foo gnuradio::gnuradio-runtime ${Boost_LIBRARIES} ${UHD_LIBRARIES}) target_link_libraries(gnuradio-foo
gnuradio::gnuradio-runtime
gnuradio::gnuradio-pmt
gnuradio::gnuradio-blocks
gnuradio::gnuradio-filter
gnuradio::gnuradio-analog
${UHD_LIBRARIES})
target_include_directories(gnuradio-foo target_include_directories(gnuradio-foo
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include> PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
PUBLIC $<INSTALL_INTERFACE:include> PUBLIC $<INSTALL_INTERFACE:include>