Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

coin-cgl : added 0.60.6 #15270

Closed
wants to merge 3 commits into from
Closed

coin-cgl : added 0.60.6 #15270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec1a63c
coin-cgl : added 0.60.6
oleurodecision Jan 14, 2023
8293a03
coin-cgl : requirement version management in conanfile
oleurodecision Jan 19, 2023
b5e6253
coin-cgl : reordered declarations (higher version first), renamed pat…
oleurodecision Feb 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion recipes/coin-cgl/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
sources:
"0.60.6":
url: "https://github.com/coin-or/Cgl/archive/releases/0.60.6.tar.gz"
sha256: "9e2c51ffad816ab408763d6b931e2a3060482ee4bf1983148969de96d4b2c9ce"
"0.60.3":
url: "https://github.com/coin-or/Cgl/archive/releases/0.60.3.tar.gz"
sha256: "cfeeedd68feab7c0ce377eb9c7b61715120478f12c4dd0064b05ad640e20f3fb"
patches:
"0.60.6":
- patch_file: "patches/0.60.6-0001-no-pkg-config-check.patch"
base_path: "source_subfolder"
"0.60.3":
- patch_file: "patches/0001-no-pkg-config-check.patch"
- patch_file: "patches/0.60.3-0001-no-pkg-config-check.patch"
base_path: "source_subfolder"
11 changes: 8 additions & 3 deletions recipes/coin-cgl/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,14 @@ def configure(self):
del self.options.fPIC

def requirements(self):
self.requires("coin-utils/2.11.4")
self.requires("coin-osi/0.108.6")
self.requires("coin-clp/1.17.6")
if self.version == "0.60.3":
self.requires("coin-utils/2.11.4")
self.requires("coin-osi/0.108.6")
self.requires("coin-clp/1.17.6")
else:
self.requires("coin-utils/2.11.6")
self.requires("coin-osi/0.108.7")
self.requires("coin-clp/1.17.7")
Comment on lines +54 to +61
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if self.version == "0.60.3":
self.requires("coin-utils/2.11.4")
self.requires("coin-osi/0.108.6")
self.requires("coin-clp/1.17.6")
else:
self.requires("coin-utils/2.11.6")
self.requires("coin-osi/0.108.7")
self.requires("coin-clp/1.17.7")
self.requires("coin-utils/2.11.6")
self.requires("coin-osi/0.108.7")
self.requires("coin-clp/1.17.7")


@property
def _settings_build(self):
Expand Down
0 ...ll/patches/0001-no-pkg-config-check.patch → ...hes/0.60.3-0001-no-pkg-config-check.patch
View file
Open in desktop
File renamed without changes.
13 changes: 13 additions & 0 deletions recipes/coin-cgl/all/patches/0.60.6-0001-no-pkg-config-check.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
--- Cgl/Makefile.in
+++ Cgl/Makefile.in
@@ -894,8 +894,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 cgl > $(addlibsdir)/cgl_addlibs.txt
+@COIN_HAS_PKGCONFIG_TRUE@ #PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@:$(DESTDIR)$(pkgconfiglibdir) \
+@COIN_HAS_PKGCONFIG_TRUE@ #$(PKG_CONFIG) --libs cgl > $(addlibsdir)/cgl_addlibs.txt
@COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@ echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libCgl.lib @CGLLIB_LIBS_INSTALLED@" > $(addlibsdir)/cgl_addlibs.txt
@COIN_CXX_IS_CL_FALSE@@COIN_HAS_PKGCONFIG_FALSE@ echo -L@abs_lib_dir@ -lCgl @CGLLIB_LIBS_INSTALLED@ > $(addlibsdir)/cgl_addlibs.txt

2 changes: 2 additions & 0 deletions recipes/coin-cgl/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
versions:
"0.60.6":
folder: "all"
"0.60.3":
folder: "all"