[hamradio-commits] [gnss-sdr] 10/16: Add CMake hint

[Carles Fernandez]

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

carles_fernandez-guest pushed a commit to branch master
in repository gnss-sdr.

commit 2374cb152cc7025f588c75bdd5003aea42fe9bfc
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Sat Jul 2 20:10:18 2016 +0200

    Add CMake hint
    
    See
    https://github.com/gnuradio/volk/commit/78c8bc4a0e49487e1f787f0fe77d8c3dace7c7fa
---
 .../libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt    | 13 +++++++++----
 .../{VolkConfig.cmake => VolkGnsssdrConfig.cmake.in}        |  2 ++
 ...igVersion.cmake.in => VolkGnsssdrConfigVersion.cmake.in} |  0
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt
index 1bcf607..9d2374b 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt
@@ -229,8 +229,13 @@ endif()
 ########################################################################
 
 configure_file(
-  ${PROJECT_SOURCE_DIR}/cmake/Modules/VolkConfigVersion.cmake.in
-  ${PROJECT_BINARY_DIR}/cmake/Modules/VolkConfigVersion.cmake
+  ${CMAKE_SOURCE_DIR}/cmake/Modules/VolkGnsssdrConfig.cmake.in
+  ${CMAKE_BINARY_DIR}/cmake/Modules/VolkGnsssdrConfig.cmake
+ at ONLY)
+
+configure_file(
+  ${PROJECT_SOURCE_DIR}/cmake/Modules/VolkGnsssdrConfigVersion.cmake.in
+  ${PROJECT_BINARY_DIR}/cmake/Modules/VolkGnsssdrConfigVersion.cmake
 @ONLY)
 
 
@@ -244,8 +249,8 @@ endif(NOT CMAKE_MODULES_DIR)
 
 install(
     FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/VolkConfig.cmake
-    ${CMAKE_CURRENT_BINARY_DIR}/cmake/Modules/VolkConfigVersion.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/cmake/Modules/VolkGnsssdrConfig.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/cmake/Modules/VolkGnsssdrConfigVersion.cmake
     DESTINATION ${CMAKE_MODULES_DIR}/volk_gnsssdr
     COMPONENT "volk_gnsssdr_devel"
 )
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkConfig.cmake b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkGnsssdrConfig.cmake.in
similarity index 90%
rename from src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkConfig.cmake
rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkGnsssdrConfig.cmake.in
index 233fbc1..f07b02d 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkConfig.cmake
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkGnsssdrConfig.cmake.in
@@ -9,6 +9,7 @@ FIND_PATH(
     PATHS /usr/local/include
           /usr/include
           /opt/local/include
+          "@CMAKE_INSTALL_PREFIX@/include"
 )
 
 FIND_LIBRARY(
@@ -21,6 +22,7 @@ FIND_LIBRARY(
           /usr/lib
           /usr/lib64
           /opt/local/lib
+          "@CMAKE_INSTALL_PREFIX@/lib"
 )
 
 INCLUDE(FindPackageHandleStandardArgs)
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkConfigVersion.cmake.in b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkGnsssdrConfigVersion.cmake.in
similarity index 100%
rename from src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkConfigVersion.cmake.in
rename to src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkGnsssdrConfigVersion.cmake.in

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git