diff options
| author | Paul Cercueil <paul.cercueil@analog.com> | 2016-05-18 11:44:42 +0200 |
|---|---|---|
| committer | Paul Cercueil <paul.cercueil@analog.com> | 2016-05-19 16:49:35 +0200 |
| commit | 8c469f72987d0e37bfa3cc81121702b25109bf94 (patch) | |
| tree | 07e7038b47eb7c96ab27b8ab9b49083c00d6cdfe | |
| parent | 681846ff4f16388482ed7c6fb2a53e31e553e6a2 (diff) | |
CMake: Generate GnuradioConfig.cmake with a hardcoded install path hint
This permits out-of-tree modules to properly find the headers and
libraries of GNU Radio when GNU Radio was built with a prefix that
differs from the expected paths.
Signed-off-by: Paul Cercueil <paul.cercueil@analog.com>
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | cmake/Modules/GnuradioConfig.cmake.in (renamed from cmake/Modules/GnuradioConfig.cmake) | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3641ab4b5c..cbac0b5f8f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -425,12 +425,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..fb41a797c0 100644 --- a/cmake/Modules/GnuradioConfig.cmake +++ b/cmake/Modules/GnuradioConfig.cmake.in @@ -72,6 +72,7 @@ function(GR_MODULE EXTVAR PCNAME INCFILE LIBFILE) ${CMAKE_INSTALL_PREFIX}/include PATHS /usr/local/include /usr/include + "@CMAKE_INSTALL_PREFIX@/include" ) # look for libs @@ -87,6 +88,7 @@ function(GR_MODULE EXTVAR PCNAME INCFILE LIBFILE) /usr/local/lib64 /usr/lib /usr/lib64 + "@CMAKE_INSTALL_PREFIX@/lib" ) list(APPEND ${LIBVAR_NAME} ${${LIBVAR_NAME}_${libname}}) endforeach(libname) |