Skip to content

Commit

Permalink
use current libboost-devel for windows, too
Browse files Browse the repository at this point in the history
- need to have libboost-devel in every host section, except zimpl, to get
  dependency on libboost in packages
  • Loading branch information
svigerske committed Nov 9, 2024
1 parent b6c0953 commit 852020f
Showing 1 changed file with 10 additions and 11 deletions.
21 changes: 10 additions & 11 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ source:
- 0001-disable-boost-no-lib.patch # [win]

build:
number: 1
number: 2

requirements:
build:
Expand All @@ -41,9 +41,7 @@ requirements:
- zlib
- ipopt
- cppad
# upstream code not compatible with newer boost, apparently
- boost-cpp 1.72 # [win]
- libboost-devel # [unix]
- libboost-devel
- mpfr
- gmp
- cliquer # [unix]
Expand All @@ -63,7 +61,8 @@ outputs:
- zlib
- gmp
- mpfr
- libboost-headers
- libboost-headers # [unix]
- libboost-devel # [win]
- libblas
run:
- tbb-devel
Expand Down Expand Up @@ -101,6 +100,7 @@ outputs:
- libblas
# zimpl statically linked, transitive usage requirements
- pcre2 # [win]
- libboost-devel # [win]
files:
- "{{ install_prefix }}/lib/libscip*"
- "{{ install_prefix }}/lib/cmake/scip/"
Expand Down Expand Up @@ -139,14 +139,12 @@ outputs:
- zlib
- gmp
- mpfr
- boost-cpp 1.72 # [win]
- libboost-devel # [unix]
- libboost-headers # [unix]
- libboost-devel # [win]
# Papilo statically linked but needs direct dependency from used shared libs.
- tbb-devel
- libblas
run:
# old boost-cpp does not set run_exports, need to set it manually
- boost-cpp 1.72 # [win]
- zlib
- {{ pin_subpackage('papilo', exact=True) }}
files:
Expand All @@ -167,8 +165,8 @@ outputs:
- ninja
# Papilo statically linked
- {{ compiler('fortran') }}
# compiling the example needs to find boost metadata
- libboost-devel # [unix]
# compiling the example needs to find boost
- libboost-devel

- name: gcg
version: {{ gcg_version }}
Expand All @@ -185,6 +183,7 @@ outputs:
- cliquer # [unix]
- gnuplot # [unix]
- {{ pin_subpackage('scip', exact=True) }}
- libboost-devel # [win]
run:
- {{ pin_subpackage('scip') }}
# run_exports not set for cliquer
Expand Down

0 comments on commit 852020f

Please sign in to comment.