diff options
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | cmake/Modules/GnuradioConfig.cmake.in | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index cbac0b5f8f..232adb3268 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -323,6 +323,9 @@ if(NOT VOLK_FOUND) set(VOLK_LIBRARIES volk) + set(VOLK_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_PREFIX}/lib) + set(VOLK_INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include) + if(ENABLE_VOLK) include(GrPackage) @@ -344,6 +347,9 @@ if(NOT VOLK_FOUND) else() message(STATUS " An external VOLK has been found and will be used for build.") set(ENABLE_VOLK TRUE) + + get_filename_component(VOLK_INSTALL_LIBRARY_DIR "${VOLK_LIBRARIES}" DIRECTORY) + set(VOLK_INSTALL_INCLUDE_DIR ${VOLK_INCLUDE_DIRS}) endif(NOT VOLK_FOUND) message(STATUS " Override with -DENABLE_INTERNAL_VOLK=ON/OFF") diff --git a/cmake/Modules/GnuradioConfig.cmake.in b/cmake/Modules/GnuradioConfig.cmake.in index fb41a797c0..fc7499dfdf 100644 --- a/cmake/Modules/GnuradioConfig.cmake.in +++ b/cmake/Modules/GnuradioConfig.cmake.in @@ -73,6 +73,7 @@ function(GR_MODULE EXTVAR PCNAME INCFILE LIBFILE) PATHS /usr/local/include /usr/include "@CMAKE_INSTALL_PREFIX@/include" + "@VOLK_INSTALL_INCLUDE_DIR@" ) # look for libs @@ -89,6 +90,7 @@ function(GR_MODULE EXTVAR PCNAME INCFILE LIBFILE) /usr/lib /usr/lib64 "@CMAKE_INSTALL_PREFIX@/lib" + "@VOLK_INSTALL_LIBRARY_DIR@" ) list(APPEND ${LIBVAR_NAME} ${${LIBVAR_NAME}_${libname}}) endforeach(libname) |