diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/GnuradioConfig.cmake.in (renamed from cmake/Modules/GnuradioConfig.cmake) | 4 | ||||
| -rw-r--r-- | cmake/Modules/GrVersion.cmake | 8 |
2 files changed, 11 insertions, 1 deletions
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) diff --git a/cmake/Modules/GrVersion.cmake b/cmake/Modules/GrVersion.cmake index bafd0a7326..dceac67bab 100644 --- a/cmake/Modules/GrVersion.cmake +++ b/cmake/Modules/GrVersion.cmake @@ -41,7 +41,13 @@ if(GIT_FOUND AND EXISTS ${CMAKE_SOURCE_DIR}/.git) WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} ) else() - set(GIT_DESCRIBE "v${MAJOR_VERSION}.${API_COMPAT}.x-xxx-xunknown") + if(NOT GR_GIT_COUNT) + set(GR_GIT_COUNT "compat-xxx") + endif() + if(NOT GR_GIT_HASH) + set(GR_GIT_HASH "xunknown") + endif() + set(GIT_DESCRIBE "v${MAJOR_VERSION}.${API_COMPAT}-${GR_GIT_COUNT}-${GR_GIT_HASH}") endif() ######################################################################## |