diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /sci-libs/lemon/files |
reinit the tree, so we can have metadata
Diffstat (limited to 'sci-libs/lemon/files')
-rw-r--r-- | sci-libs/lemon/files/lemon-1.3-as-needed.patch | 47 | ||||
-rw-r--r-- | sci-libs/lemon/files/lemon-1.3-multilib.patch | 18 |
2 files changed, 65 insertions, 0 deletions
diff --git a/sci-libs/lemon/files/lemon-1.3-as-needed.patch b/sci-libs/lemon/files/lemon-1.3-as-needed.patch new file mode 100644 index 000000000000..ab205e69a4fa --- /dev/null +++ b/sci-libs/lemon/files/lemon-1.3-as-needed.patch @@ -0,0 +1,47 @@ + CMakeLists.txt | 4 ++++ + lemon/CMakeLists.txt | 2 ++ + 2 files changed, 6 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b06e5c7..fa68aa8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -84,21 +84,25 @@ IF(GLPK_FOUND) + SET(LEMON_HAVE_LP TRUE) + SET(LEMON_HAVE_MIP TRUE) + SET(LEMON_HAVE_GLPK TRUE) ++ SET(LEMON_LP_LIBRARIES ${LEMON_LP_LIBRARIES} ${GLPK_LIBRARIES}) + ENDIF(GLPK_FOUND) + IF(ILOG_FOUND) + SET(LEMON_HAVE_LP TRUE) + SET(LEMON_HAVE_MIP TRUE) + SET(LEMON_HAVE_CPLEX TRUE) ++ SET(LEMON_LP_LIBRARIES ${LEMON_LP_LIBRARIES} ${ILOG_LIBRARIES}) + ENDIF(ILOG_FOUND) + IF(COIN_FOUND) + SET(LEMON_HAVE_LP TRUE) + SET(LEMON_HAVE_MIP TRUE) + SET(LEMON_HAVE_CLP TRUE) + SET(LEMON_HAVE_CBC TRUE) ++ SET(LEMON_LP_LIBRARIES ${LEMON_LP_LIBRARIES} ${COIN_LIBRARIES}) + ENDIF(COIN_FOUND) + IF(SOPLEX_FOUND) + SET(LEMON_HAVE_LP TRUE) + SET(LEMON_HAVE_SOPLEX TRUE) ++ SET(LEMON_LP_LIBRARIES ${LEMON_LP_LIBRARIES} ${COIN_LIBRARIES}) + ENDIF(SOPLEX_FOUND) + + IF(ILOG_FOUND) +diff --git a/lemon/CMakeLists.txt b/lemon/CMakeLists.txt +index 8011833..2487345 100644 +--- a/lemon/CMakeLists.txt ++++ b/lemon/CMakeLists.txt +@@ -59,6 +59,8 @@ IF(UNIX) + SET_TARGET_PROPERTIES(lemon PROPERTIES OUTPUT_NAME emon) + ENDIF() + ++TARGET_LINK_LIBRARIES(lemon ${LEMON_LP_LIBRARIES}) ++ + INSTALL( + TARGETS lemon + ARCHIVE DESTINATION lib diff --git a/sci-libs/lemon/files/lemon-1.3-multilib.patch b/sci-libs/lemon/files/lemon-1.3-multilib.patch new file mode 100644 index 000000000000..ee578d4a0f6a --- /dev/null +++ b/sci-libs/lemon/files/lemon-1.3-multilib.patch @@ -0,0 +1,18 @@ + lemon/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lemon/CMakeLists.txt b/lemon/CMakeLists.txt +index 8011833..0209acf 100644 +--- a/lemon/CMakeLists.txt ++++ b/lemon/CMakeLists.txt +@@ -61,8 +61,8 @@ ENDIF() + + INSTALL( + TARGETS lemon +- ARCHIVE DESTINATION lib +- LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib${LIB_SUFFIX} ++ LIBRARY DESTINATION lib${LIB_SUFFIX} + COMPONENT library + ) + |