diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-05-30 13:01:02 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-05-30 13:01:02 -0700 |
| commit | 508aa3d87ba839e454df982d75ec34a02ede70f9 (patch) | |
| tree | b70c068f17e8ae768d7748cc74ffaa4e9d88fc7c /cmake | |
| parent | 0b22497e22e1d0842c6d41a12998a616c31dce3f (diff) | |
| parent | 2b388eac959cc9b516f5ef6dea4f79d51a540dfd (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/GnuradioConfig.cmake.in (renamed from cmake/Modules/GnuradioConfig.cmake) | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cmake/Modules/GnuradioConfig.cmake b/cmake/Modules/GnuradioConfig.cmake.in index 83d72c1743..d9ca22dd7a 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) |