Skip to content

Commit

Permalink
add coin-clp/1.17.7
Browse files Browse the repository at this point in the history
  • Loading branch information
SpaceIm committed Feb 9, 2023
1 parent 229ed4b commit f7a2984
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 2 deletions.
9 changes: 7 additions & 2 deletions recipes/coin-clp/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
sources:
"1.17.7":
url: "https://github.com/coin-or/Clp/archive/refs/tags/releases/1.17.7.tar.gz"
sha256: "c4c2c0e014220ce8b6294f3be0f3a595a37bef58a14bf9bac406016e9e73b0f5"
"1.17.6":
url: "https://github.com/coin-or/Clp/archive/releases/1.17.6.tar.gz"
url: "https://github.com/coin-or/Clp/archive/refs/tags/releases/1.17.6.tar.gz"
sha256: "afff465b1620cfcbb7b7c17b5d331d412039650ff471c4160c7eb24ae01284c9"
patches:
"1.17.7":
- patch_file: "patches/1.17.7-0001-no-pkg-config-check.patch"
"1.17.6":
- patch_file: "patches/0001-no-pkg-config-check.patch"
- patch_file: "patches/1.17.6-0001-no-pkg-config-check.patch"
13 changes: 13 additions & 0 deletions recipes/coin-clp/all/patches/1.17.7-0001-no-pkg-config-check.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
--- Clp/Makefile.in
+++ Clp/Makefile.in
@@ -924,8 +924,8 @@

install-data-hook:
@$(mkdir_p) "$(addlibsdir)"
-@COIN_HAS_PKGCONFIG_TRUE@ PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@:$(DESTDIR)$(pkgconfiglibdir) \
-@COIN_HAS_PKGCONFIG_TRUE@ $(PKG_CONFIG) --libs clp > $(addlibsdir)/clp_addlibs.txt
+@COIN_HAS_PKGCONFIG_TRUE@ #PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@:$(DESTDIR)$(pkgconfiglibdir) \
+@COIN_HAS_PKGCONFIG_TRUE@ #$(PKG_CONFIG) --libs clp > $(addlibsdir)/clp_addlibs.txt
@COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@ echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libClpSolver.lib libClp.lib @CLPLIB_LIBS_INSTALLED@" > $(addlibsdir)/clp_addlibs.txt
@COIN_CXX_IS_CL_FALSE@@COIN_HAS_PKGCONFIG_FALSE@ echo -L@abs_lib_dir@ -lClp @CLPLIB_LIBS_INSTALLED@ > $(addlibsdir)/clp_addlibs.txt

2 changes: 2 additions & 0 deletions recipes/coin-clp/config.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
versions:
"1.17.7":
folder: "all"
"1.17.6":
folder: "all"

0 comments on commit f7a2984

Please sign in to comment.