[Commit-gnuradio] [gnuradio] 01/14: CMake: Generate GnuradioConfig.cmake with a hardcoded install path hint

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 8c469f72987d0e37bfa3cc81121702b25109bf94
Author: Paul Cercueil <address@hidden>
Date:   Wed May 18 11:44:42 2016 +0200

    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 <address@hidden>
---
 CMakeLists.txt                                                  | 7 ++++++-
 cmake/Modules/{GnuradioConfig.cmake => GnuradioConfig.cmake.in} | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3641ab4..cbac0b5 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
address@hidden)
+
+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
similarity index 98%
rename from cmake/Modules/GnuradioConfig.cmake
rename to cmake/Modules/GnuradioConfig.cmake.in
index 31532c6..fb41a79 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)