diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-05-30 13:16:12 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-05-30 13:16:12 -0700 |
| commit | 11ce2621937e6fa1d5440c8f485c7a27b9d34d27 (patch) | |
| tree | 3e8ddc3de6d9343412022c878908af1134dcdbd7 /cmake | |
| parent | 313990f678e255c76182f4dd822af3a268c8f18d (diff) | |
| parent | 45d19af2509272020298499aec37c3af42cb71d5 (diff) | |
Merge branch 'next' into next-qt5
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) |