[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 05/07: cmake: modtool: On Apple only, set i
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 05/07: cmake: modtool: On Apple only, set install name and use rpath correctly. |
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 c7e2ae445f3d0de6859e0267b11ae4230f6ccbdf
Author: Michael Dickens <address@hidden>
Date: Wed Sep 24 13:56:08 2014 -0400
cmake: modtool: On Apple only, set install name and use rpath correctly.
---
gr-utils/python/modtool/gr-newmod/CMakeLists.txt | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/gr-utils/python/modtool/gr-newmod/CMakeLists.txt
b/gr-utils/python/modtool/gr-newmod/CMakeLists.txt
index 9f5060e..2b2cabf 100644
--- a/gr-utils/python/modtool/gr-newmod/CMakeLists.txt
+++ b/gr-utils/python/modtool/gr-newmod/CMakeLists.txt
@@ -81,6 +81,26 @@ set(GR_PKG_LIBEXEC_DIR
${GR_LIBEXEC_DIR}/${CMAKE_PROJECT_NAME})
set(GRC_BLOCKS_DIR ${GR_PKG_DATA_DIR}/grc/blocks)
########################################################################
+# On Apple only, set install name and use rpath correctly, if not already set
+########################################################################
+if(APPLE)
+ if(NOT CMAKE_INSTALL_NAME_DIR)
+ set(CMAKE_INSTALL_NAME_DIR
+ ${CMAKE_INSTALL_PREFIX}/${GR_LIBRARY_DIR} CACHE
+ PATH "Library Install Name Destination Directory" FORCE)
+ endif(NOT CMAKE_INSTALL_NAME_DIR)
+ if(NOT CMAKE_INSTALL_RPATH)
+ set(CMAKE_INSTALL_RPATH
+ ${CMAKE_INSTALL_PREFIX}/${GR_LIBRARY_DIR} CACHE
+ PATH "Library Install RPath" FORCE)
+ endif(NOT CMAKE_INSTALL_RPATH)
+ if(NOT CMAKE_BUILD_WITH_INSTALL_RPATH)
+ set(CMAKE_BUILD_WITH_INSTALL_RPATH ON CACHE
+ BOOL "Do Build Using Library Install RPath" FORCE)
+ endif(NOT CMAKE_BUILD_WITH_INSTALL_RPATH)
+endif(APPLE)
+
+########################################################################
# Find gnuradio build dependencies
########################################################################
find_package(CppUnit)
- [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, 2014/10/13
- [Commit-gnuradio] [gnuradio] 05/07: cmake: modtool: On Apple only, set install name and use rpath correctly.,
git <=
- [Commit-gnuradio] [gnuradio] 02/07: cmake: OSS is not for APPLE or WINDOWS., git, 2014/10/13