diff options
| author | Paul Cercueil <paul.cercueil@analog.com> | 2016-05-18 15:35:03 +0200 |
|---|---|---|
| committer | Paul Cercueil <paul.cercueil@analog.com> | 2016-05-19 16:49:58 +0200 |
| commit | 1129f2f6131d1e926c0f38a5d2d5f04b4c9d50b7 (patch) | |
| tree | b2ba090dfc786a32f2984441083660b35864902f | |
| parent | 8c469f72987d0e37bfa3cc81121702b25109bf94 (diff) | |
CMake: Fix search paths for the Volk submodule in GnuradioConfig.cmake
GnuradioConfig.cmake allows to find Volk as a submodule of GNU Radio.
However, GNU Radio might have been built with an external libvolk; so,
GnuradioConfig.cmake should search Volk in the installation prefix of
GNU Radio, as well as in the installation prefix of the library.
Signed-off-by: Paul Cercueil <paul.cercueil@analog.com>
| -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) |