dff: forgotten patch added

This commit is contained in:
Anton Bolshakov 2011-06-27 02:27:56 +00:00
parent bda0451392
commit 8d243891cb
2 changed files with 41 additions and 0 deletions

View file

@ -1,5 +1,6 @@
AUX dff-1.0.0-disable-qtassistant.patch 1657 RMD160 06b9679458b97f91c33eb74fa84d7c0d55b816eb SHA1 535d4e60cee04b53d044f273053cd69043472197 SHA256 c4f17f4f3d65987802953683bce3f966d4f149c5deefc465354e63e8a090e5cf
AUX dff-1.1.0-disable-qtassistant.patch 1657 RMD160 06b9679458b97f91c33eb74fa84d7c0d55b816eb SHA1 535d4e60cee04b53d044f273053cd69043472197 SHA256 c4f17f4f3d65987802953683bce3f966d4f149c5deefc465354e63e8a090e5cf
AUX dff-1.1.0-libpff-libbfio.patch 1579 RMD160 78f3c0dde17e362fb2e394a934c6056378d5e8cf SHA1 73ac651c35566a2ed077fada9c3411eacd578aa6 SHA256 c5710ed7c45b14496ce998e464db0aced4f5ed95644bb7c43d90e8c5a0714406
DIST dff-src-1.0.0.tar.gz 9793438 RMD160 82dbf88845012ac12d57fafd9937adf5281a99a0 SHA1 b103026f3fa2d313f2c832274d361007f79a84ba SHA256 365bd6e662f7585846f8821e12c548ed405c36a4ecd57b8a98c759162d6b2444
DIST dff-src-1.1.0.tar.gz 9751963 RMD160 59c62046e6f06766fdfe27ae4b1c7e8f811f5c13 SHA1 3eb0700b40a4bdc29ab9dbd3ecbae0441303b6b3 SHA256 0dab2e10f9c2cb2d1363b51284e9616725f85e84aea58719848f41626fa894d1
EBUILD dff-1.0.0-r1.ebuild 979 RMD160 ff7480f17c210f54ce876fb30e12e404b52aa7e1 SHA1 75a47bf150f614c3ee7c57f1b254cb6133b7bdf9 SHA256 3cc499612cbc3e7b550f1c163255b36246eed091b6291952d33cb4d44cecbba1

View file

@ -0,0 +1,40 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1321a40..1f78be7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -225,19 +225,10 @@ endif(ENABLE_INDEXER)
# Need libbfio separate installation for DFF to be able to use PFF.
# To summarize, install http://libbfio.sf.net first, before http://libpff.sf.net .
if(UNIX)
- if(INSTALL)
- # Link with static version at install, until PFF be added to respective packages streams
- find_library(PFF_MAIN_LIBRARY NAMES libpff.a)
- else(INSTALL)
- find_library(PFF_MAIN_LIBRARY NAMES pff)
- endif(INSTALL)
+ find_library(PFF_MAIN_LIBRARY NAMES pff)
if(PFF_MAIN_LIBRARY)
message(STATUS "PFF library found: ${PFF_MAIN_LIBRARY}")
- if(INSTALL)
- find_library(PFF_BFIO_LIBRARY NAMES libbfio.a)
- else(INSTALL)
- find_library(PFF_BFIO_LIBRARY NAMES bfio)
- endif(INSTALL)
+ find_library(PFF_BFIO_LIBRARY NAMES bfio)
if(PFF_BFIO_LIBRARY)
message(STATUS "Separate PFF bfio library found: ${PFF_BFIO_LIBRARY}")
else(PFF_BFIO_LIBRARY)
@@ -251,12 +242,7 @@ endif(UNIX)
## AFFlib check for AFF connector, added separatly on windows
# TODO ; we need afflib >= 3.6, this have to be checked
if(UNIX)
- if(INSTALL)
- # Link with static version at install, until AFF >= 3.6 be added to respective packages streams
- find_library(AFF_LIBRARY NAMES libafflib.a)
- else(INSTALL)
- find_library(AFF_LIBRARY NAMES afflib)
- endif(INSTALL)
+ find_library(AFF_LIBRARY NAMES afflib)
if(AFF_LIBRARY)
message(STATUS "AFF library found: ${AFF_LIBRARY}")
else(AFF_LIBRARY)