From 2374cb152cc7025f588c75bdd5003aea42fe9bfc Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 2 Jul 2016 20:10:18 +0200 Subject: [PATCH] Add CMake hint See https://github.com/gnuradio/volk/commit/78c8bc4a0e49487e1f787f0fe77d8c3dace7c7fa --- .../volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt | 13 +++++++++---- ...{VolkConfig.cmake => VolkGnsssdrConfig.cmake.in} | 2 ++ ...n.cmake.in => VolkGnsssdrConfigVersion.cmake.in} | 0 3 files changed, 11 insertions(+), 4 deletions(-) rename src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/{VolkConfig.cmake => VolkGnsssdrConfig.cmake.in} (90%) rename src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/{VolkConfigVersion.cmake.in => VolkGnsssdrConfigVersion.cmake.in} (100%) 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 1bcf60780..9d2374b73 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 +@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 233fbc102..f07b02d50 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