1 |
bicatali 14/02/04 18:19:49 |
2 |
|
3 |
Added: lemon-1.3-as-needed.patch |
4 |
Removed: lemon-1.3-underlinking.patch |
5 |
Log: |
6 |
Fixed as-needed bug #500272 |
7 |
|
8 |
(Portage version: 2.2.8-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 sci-libs/lemon/files/lemon-1.3-as-needed.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/lemon/files/lemon-1.3-as-needed.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/lemon/files/lemon-1.3-as-needed.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: lemon-1.3-as-needed.patch |
17 |
=================================================================== |
18 |
CMakeLists.txt | 4 ++++ |
19 |
lemon/CMakeLists.txt | 2 ++ |
20 |
2 files changed, 6 insertions(+) |
21 |
|
22 |
diff --git a/CMakeLists.txt b/CMakeLists.txt |
23 |
index b06e5c7..fa68aa8 100644 |
24 |
--- a/CMakeLists.txt |
25 |
+++ b/CMakeLists.txt |
26 |
@@ -84,21 +84,25 @@ IF(GLPK_FOUND) |
27 |
SET(LEMON_HAVE_LP TRUE) |
28 |
SET(LEMON_HAVE_MIP TRUE) |
29 |
SET(LEMON_HAVE_GLPK TRUE) |
30 |
+ SET(LEMON_LP_LIBRARIES ${LEMON_LP_LIBRARIES} ${GLPK_LIBRARIES}) |
31 |
ENDIF(GLPK_FOUND) |
32 |
IF(ILOG_FOUND) |
33 |
SET(LEMON_HAVE_LP TRUE) |
34 |
SET(LEMON_HAVE_MIP TRUE) |
35 |
SET(LEMON_HAVE_CPLEX TRUE) |
36 |
+ SET(LEMON_LP_LIBRARIES ${LEMON_LP_LIBRARIES} ${ILOG_LIBRARIES}) |
37 |
ENDIF(ILOG_FOUND) |
38 |
IF(COIN_FOUND) |
39 |
SET(LEMON_HAVE_LP TRUE) |
40 |
SET(LEMON_HAVE_MIP TRUE) |
41 |
SET(LEMON_HAVE_CLP TRUE) |
42 |
SET(LEMON_HAVE_CBC TRUE) |
43 |
+ SET(LEMON_LP_LIBRARIES ${LEMON_LP_LIBRARIES} ${COIN_LIBRARIES}) |
44 |
ENDIF(COIN_FOUND) |
45 |
IF(SOPLEX_FOUND) |
46 |
SET(LEMON_HAVE_LP TRUE) |
47 |
SET(LEMON_HAVE_SOPLEX TRUE) |
48 |
+ SET(LEMON_LP_LIBRARIES ${LEMON_LP_LIBRARIES} ${COIN_LIBRARIES}) |
49 |
ENDIF(SOPLEX_FOUND) |
50 |
|
51 |
IF(ILOG_FOUND) |
52 |
diff --git a/lemon/CMakeLists.txt b/lemon/CMakeLists.txt |
53 |
index 8011833..2487345 100644 |
54 |
--- a/lemon/CMakeLists.txt |
55 |
+++ b/lemon/CMakeLists.txt |
56 |
@@ -59,6 +59,8 @@ IF(UNIX) |
57 |
SET_TARGET_PROPERTIES(lemon PROPERTIES OUTPUT_NAME emon) |
58 |
ENDIF() |
59 |
|
60 |
+TARGET_LINK_LIBRARIES(lemon ${LEMON_LP_LIBRARIES}) |
61 |
+ |
62 |
INSTALL( |
63 |
TARGETS lemon |
64 |
ARCHIVE DESTINATION lib |