[Commit-gnuradio] [gnuradio] 02/06: cmake: fix setting and usage of CMAKE_MODULES_DIR

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 43a990f9495827c9fcfd6d6220dc7dab17415b66
Author: Michael Dickens <address@hidden>
Date:   Tue Aug 26 11:50:23 2014 -0400

    cmake: fix setting and usage of CMAKE_MODULES_DIR
---
 CMakeLists.txt      | 4 ++--
 volk/CMakeLists.txt | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 60efb20..131be69 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -364,7 +364,7 @@ SET(cmake_configs
 )
 
 if(NOT CMAKE_MODULES_DIR)
-   set(CMAKE_MODULES_DIR lib${LIB_SUFFIX}/cmake/gnuradio)
+  set(CMAKE_MODULES_DIR lib${LIB_SUFFIX}/cmake)
 endif(NOT CMAKE_MODULES_DIR)
 
 # Install all other cmake files into same directory
@@ -375,7 +375,7 @@ list(REMOVE_ITEM cmake_others
 
 install(
   FILES ${cmake_configs} ${cmake_others}
-  DESTINATION ${CMAKE_MODULES_DIR}
+  DESTINATION ${CMAKE_MODULES_DIR}/gnuradio
   COMPONENT "runtime_devel"
 )
 
diff --git a/volk/CMakeLists.txt b/volk/CMakeLists.txt
index 66789e4..efde601 100644
--- a/volk/CMakeLists.txt
+++ b/volk/CMakeLists.txt
@@ -135,9 +135,14 @@ install(FILES
 ########################################################################
 # Install cmake search routine for external use
 ########################################################################
+
+if(NOT CMAKE_MODULES_DIR)
+    set(CMAKE_MODULES_DIR lib${LIB_SUFFIX}/cmake)
+endif(NOT CMAKE_MODULES_DIR)
+
 install(
     FILES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/VolkConfig.cmake
-    DESTINATION lib${LIB_SUFFIX}/cmake/volk/
+    DESTINATION ${CMAKE_MODULES_DIR}/volk
     COMPONENT "volk_devel"
 )