From 5cbf8e05d4623255d4135f5a2e7f4b63350a658e Mon Sep 17 00:00:00 2001 From: Tim O'Shea Date: Thu, 10 Oct 2013 09:44:48 -0400 Subject: [PATCH 1/2] install fecapiConfig.cmake to allow other modules to easily find fecapi libraries and headers --- CMakeLists.txt | 8 ++++++++ cmake/Modules/fecapiConfig.cmake | 30 ++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 cmake/Modules/fecapiConfig.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 04fd134..32d15b6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -171,3 +171,11 @@ add_subdirectory(python) add_subdirectory(grc) add_subdirectory(apps) add_subdirectory(volk_fecapi) + +######################################################################## +# Install cmake search helper for this library +######################################################################## +install(FILES cmake/Modules/fecapiConfig.cmake + DESTINATION lib/cmake/fecapi +) + diff --git a/cmake/Modules/fecapiConfig.cmake b/cmake/Modules/fecapiConfig.cmake new file mode 100644 index 0000000..ba026b7 --- /dev/null +++ b/cmake/Modules/fecapiConfig.cmake @@ -0,0 +1,30 @@ +INCLUDE(FindPkgConfig) +PKG_CHECK_MODULES(PC_FECAPI fecapi) + +FIND_PATH( + FECAPI_INCLUDE_DIRS + NAMES fec/fec_api.h + HINTS $ENV{FECAPI_DIR}/include + ${PC_FECAPI_INCLUDEDIR} + PATHS ${CMAKE_INSTALL_PREEFIX}/include + /usr/local/include + /usr/include +) + +FIND_LIBRARY( + FECAPI_LIBRARIES + NAMES fec + HINTS $ENV{FECAPI_DIR}/lib + ${PC_FECAPI_LIBDIR} + PATHS ${CMAKE_INSTALL_PREFIX}/lib + ${CMAKE_INSTALL_PREFIX}/lib64 + /usr/local/lib + /usr/local/lib64 + /usr/lib + /usr/lib64 +) + +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(FECAPI DEFAULT_MSG FECAPI_LIBRARIES FECAPI_INCLUDE_DIRS) +MARK_AS_ADVANCED(FECAPI_LIBRARIES FECAPI_INCLUDE_DIRS) + From d9940a216922ca9d1bf22a7ee51c22b68aff87eb Mon Sep 17 00:00:00 2001 From: Tim O'Shea Date: Tue, 29 Oct 2013 12:22:09 -0400 Subject: [PATCH 2/2] adding headers that must be installed --- include/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 61c1e33..d811e2f 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -27,5 +27,7 @@ install(FILES fec_interleave.h fec_deinterleave.h cc_encoder.h + cc_decoder.h + cc_common.h DESTINATION include/fec )