[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 04/07: cmake: modtool: allow the use of a M
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 04/07: cmake: modtool: allow the use of a MODULES_DIR to specify where cmake modules are installed. |
Date: |
Mon, 13 Oct 2014 21:00:47 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch maint
in repository gnuradio.
commit 1c564219cc8df08f9e44861cdfdfef91e5e6a7fc
Author: Michael Dickens <address@hidden>
Date: Wed Sep 24 13:55:05 2014 -0400
cmake: modtool: allow the use of a MODULES_DIR to specify where cmake
modules are installed.
---
gr-utils/python/modtool/gr-newmod/CMakeLists.txt | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/gr-utils/python/modtool/gr-newmod/CMakeLists.txt
b/gr-utils/python/modtool/gr-newmod/CMakeLists.txt
index 677144a..9f5060e 100644
--- a/gr-utils/python/modtool/gr-newmod/CMakeLists.txt
+++ b/gr-utils/python/modtool/gr-newmod/CMakeLists.txt
@@ -155,6 +155,10 @@ add_subdirectory(docs)
########################################################################
# Install cmake search helper for this library
########################################################################
+if(NOT CMAKE_MODULES_DIR)
+ set(CMAKE_MODULES_DIR lib${LIB_SUFFIX}/cmake)
+endif(NOT CMAKE_MODULES_DIR)
+
install(FILES cmake/Modules/howtoConfig.cmake
- DESTINATION lib/cmake/howto
+ DESTINATION ${CMAKE_MODULES_DIR}/howto
)
- [Commit-gnuradio] [gnuradio] branch maint updated (a590a37 -> c80fcdb), git, 2014/10/13
- [Commit-gnuradio] [gnuradio] 01/07: cmake: gr-dtv: fix internal GR component dependencies, git, 2014/10/13
- [Commit-gnuradio] [gnuradio] 03/07: cmake: Use APPLE, not matching Darwin, git, 2014/10/13
- [Commit-gnuradio] [gnuradio] 06/07: cmake: modtool: make sure our local CMake Modules path comes first., git, 2014/10/13
- [Commit-gnuradio] [gnuradio] 07/07: cmake: modtool: update copyright date., git, 2014/10/13
- [Commit-gnuradio] [gnuradio] 04/07: cmake: modtool: allow the use of a MODULES_DIR to specify where cmake modules are installed.,
git <=
- [Commit-gnuradio] [gnuradio] 05/07: cmake: modtool: On Apple only, set install name and use rpath correctly., git, 2014/10/13
- [Commit-gnuradio] [gnuradio] 02/07: cmake: OSS is not for APPLE or WINDOWS., git, 2014/10/13