diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-05-30 12:38:31 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-05-30 12:38:31 -0700 |
| commit | 2b388eac959cc9b516f5ef6dea4f79d51a540dfd (patch) | |
| tree | b2f47f11bdcee89d8e3cb00334a8f442212b615f | |
| parent | d6f725e2b0a537596c88a07b23ee4a47d664e4f5 (diff) | |
| parent | 1129f2f6131d1e926c0f38a5d2d5f04b4c9d50b7 (diff) | |
Merge remote-tracking branch 'adi/fix_find_volk'
| -rw-r--r-- | CMakeLists.txt | 13 | ||||
| -rw-r--r-- | cmake/Modules/GnuradioConfig.cmake.in (renamed from cmake/Modules/GnuradioConfig.cmake) | 4 |
2 files changed, 16 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6e767edfa8..8b9b28faa4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -348,6 +348,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) @@ -369,6 +372,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") @@ -450,12 +456,17 @@ endif(ENABLE_GR_CTRLPORT) # http://www.cmake.org/Wiki/CMake/Tutorials/Packaging configure_file( + ${CMAKE_SOURCE_DIR}/cmake/Modules/GnuradioConfig.cmake.in + ${CMAKE_BINARY_DIR}/cmake/Modules/GnuradioConfig.cmake +@ONLY) + +configure_file( ${CMAKE_SOURCE_DIR}/cmake/Modules/GnuradioConfigVersion.cmake.in ${CMAKE_BINARY_DIR}/cmake/Modules/GnuradioConfigVersion.cmake @ONLY) SET(cmake_configs - ${CMAKE_SOURCE_DIR}/cmake/Modules/GnuradioConfig.cmake + ${CMAKE_BINARY_DIR}/cmake/Modules/GnuradioConfig.cmake ${CMAKE_BINARY_DIR}/cmake/Modules/GnuradioConfigVersion.cmake ) diff --git a/cmake/Modules/GnuradioConfig.cmake b/cmake/Modules/GnuradioConfig.cmake.in index 31532c605c..fc7499dfdf 100644 --- a/cmake/Modules/GnuradioConfig.cmake +++ b/cmake/Modules/GnuradioConfig.cmake.in @@ -72,6 +72,8 @@ function(GR_MODULE EXTVAR PCNAME INCFILE LIBFILE) ${CMAKE_INSTALL_PREFIX}/include PATHS /usr/local/include /usr/include + "@CMAKE_INSTALL_PREFIX@/include" + "@VOLK_INSTALL_INCLUDE_DIR@" ) # look for libs @@ -87,6 +89,8 @@ function(GR_MODULE EXTVAR PCNAME INCFILE LIBFILE) /usr/local/lib64 /usr/lib /usr/lib64 + "@CMAKE_INSTALL_PREFIX@/lib" + "@VOLK_INSTALL_LIBRARY_DIR@" ) list(APPEND ${LIBVAR_NAME} ${${LIBVAR_NAME}_${libname}}) endforeach(libname) |