Archives
Archives
| From: | "Thomas Sachau (tommy)" <tommy@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in net-p2p/fms/files: fms-use-system-libs.patch |
| Date: | Wed, 08 Apr 2009 14:07:28 |
| Message-Id: | E1LrYR3-0002Gt-OB@stork.gentoo.org |
| 1 | tommy 09/04/08 14:07:25 |
| 2 | |
| 3 | Added: fms-use-system-libs.patch |
| 4 | Log: |
| 5 | Version bump |
| 6 | (Portage version: 2.2_rc28/cvs/Linux x86_64) |
| 7 | |
| 8 | Revision Changes Path |
| 9 | 1.1 net-p2p/fms/files/fms-use-system-libs.patch |
| 10 | |
| 11 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/fms/files/fms-use-system-libs.patch?rev=1.1&view=markup |
| 12 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-p2p/fms/files/fms-use-system-libs.patch?rev=1.1&content-type=text/plain |
| 13 | |
| 14 | Index: fms-use-system-libs.patch |
| 15 | =================================================================== |
| 16 | --- CMakeLists.txt 2009-04-04 16:20:16.000000000 +0200 |
| 17 | +++ CMakeLists.txt.new 2009-04-08 15:42:06.000000000 +0200 |
| 18 | @@ -294,10 +294,15 @@ |
| 19 | INCLUDE_DIRECTORIES(libs/libtommath) |
| 20 | ENDIF(TOMMATH_LIBRARY) |
| 21 | |
| 22 | - # Force use of bundled tomcrypt, as the system library may have been compiled without the features we need |
| 23 | - ADD_SUBDIRECTORY(libs/libtomcrypt) |
| 24 | - TARGET_LINK_LIBRARIES(fms tomcrypt) |
| 25 | - INCLUDE_DIRECTORIES(libs/libtomcrypt/headers) |
| 26 | + FIND_LIBRARY(TOMCRYPT_LIBRARY NAMES tomcrypt libtomcrypt) |
| 27 | + |
| 28 | + IF(TOMCRYPT_LIBRARY) |
| 29 | + TARGET_LINK_LIBRARIES(fms ${TOMCRYPT_LIBRARY}) |
| 30 | + ELSE(TOMCRYPT_LIBRARY) |
| 31 | + ADD_SUBDIRECTORY(libs/libtomcrypt) |
| 32 | + TARGET_LINK_LIBRARIES(fms tomcrypt) |
| 33 | + INCLUDE_DIRECTORIES(libs/libtomcrypt/headers) |
| 34 | + ENDIF(TOMCRYPT_LIBRARY) |
| 35 | |
| 36 | |
| 37 | ADD_DEFINITIONS(-DFROST_SUPPORT) |