| 1 |
tampakrap 10/12/30 14:23:01 |
| 2 |
|
| 3 |
Modified: cmake-utils.eclass |
| 4 |
Log: |
| 5 |
Add patch for OS X, written by Mike Lewis, bug 298121 |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.62 eclass/cmake-utils.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils.eclass?rev=1.62&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils.eclass?rev=1.62&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils.eclass?r1=1.61&r2=1.62 |
| 13 |
|
| 14 |
Index: cmake-utils.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v |
| 17 |
retrieving revision 1.61 |
| 18 |
retrieving revision 1.62 |
| 19 |
diff -u -r1.61 -r1.62 |
| 20 |
--- cmake-utils.eclass 16 Dec 2010 14:36:55 -0000 1.61 |
| 21 |
+++ cmake-utils.eclass 30 Dec 2010 14:23:01 -0000 1.62 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2010 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.61 2010/12/16 14:36:55 scarabeus Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.62 2010/12/30 14:23:01 tampakrap Exp $ |
| 27 |
|
| 28 |
# @ECLASS: cmake-utils.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -309,6 +309,17 @@ |
| 31 |
SET (CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE) |
| 32 |
SET (CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH "${EPREFIX}/usr/${CHOST}/lib/gcc;${EPREFIX}/usr/${CHOST}/lib;${EPREFIX}/usr/$(get_libdir);${EPREFIX}/$(get_libdir)" |
| 33 |
CACHE STRING "" FORCE) |
| 34 |
+ |
| 35 |
+ ELSE () |
| 36 |
+ |
| 37 |
+ SET(CMAKE_PREFIX_PATH "${EPREFIX}${PREFIX:-/usr}" CACHE STRING ""FORCE) |
| 38 |
+ SET(CMAKE_SKIP_BUILD_RPATH OFF CACHE BOOL "" FORCE) |
| 39 |
+ SET(CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE) |
| 40 |
+ SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE CACHE BOOL "" FORCE) |
| 41 |
+ SET(CMAKE_INSTALL_RPATH ${EPREFIX}${PREFIX:-/usr}/lib;${EPREFIX}/usr/${CHOST}/lib/gcc;${EPREFIX}/usr/${CHOST}/lib;${EPREFIX}/usr/$(get_libdir);${EPREFIX}/$(get_libdir)"CACHE STRING "" FORCE) |
| 42 |
+ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE CACHE BOOL "" FORCE) |
| 43 |
+ SET(CMAKE_INSTALL_NAME_DIR "${EPREFIX}${PREFIX:-/usr}/lib" CACHE STRING "" FORCE) |
| 44 |
+ |
| 45 |
ENDIF (NOT APPLE) |
| 46 |
_EOF_ |
| 47 |
fi |
Archives