diff options
| author |   Sam James <sam@gentoo.org> | 2022-02-08 05:44:45 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-02-08 05:44:45 +0000 |
| commit | ed92943627a2995fd815d7ba7a383e2a85826150 (patch) | |
| tree | d984df2afe7348290984201aa5563f10db963b6f /sci-electronics | |
| parent | net-libs/libtrace: add 4.0.18_p1 (diff) | |
| download | gentoo-ed92943627a2995fd815d7ba7a383e2a85826150.tar.gz gentoo-ed92943627a2995fd815d7ba7a383e2a85826150.tar.bz2 gentoo-ed92943627a2995fd815d7ba7a383e2a85826150.zip | |
sci-electronics/kicad: fix finding opencascade
Sync with logic in newer ebuilds to accommodate opencascade ebuild changes
(slotting was abandoned).
Closes: https://bugs.gentoo.org/832874
Thanks-to: David Flogeras <dflogeras2@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sci-electronics')
| -rw-r--r-- | sci-electronics/kicad/kicad-5.1.12-r2.ebuild (renamed from sci-electronics/kicad/kicad-5.1.12-r1.ebuild) | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/sci-electronics/kicad/kicad-5.1.12-r1.ebuild b/sci-electronics/kicad/kicad-5.1.12-r2.ebuild index 733f5b237d03..943fd0124280 100644 --- a/sci-electronics/kicad/kicad-5.1.12-r1.ebuild +++ b/sci-electronics/kicad/kicad-5.1.12-r2.ebuild @@ -111,23 +111,10 @@ src_configure() { -DPYTHON_LIBRARY="$(python_get_library_path)" ) if use occ; then - if has_version "~sci-libs/opencascade-7.5.2"; then - mycmakeargs+=( - -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade-7.5.2 - -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade-7.5.2 - ) - elif has_version "~sci-libs/opencascade-7.5.1"; then - mycmakeargs+=( - -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade-7.5.1 - -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade-7.5.1 - ) - else - # <occ-7.5 uses different layout - mycmakeargs+=( - -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade - -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir) - ) - fi + mycmakeargs+=( + -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade + -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)/opencascade + ) fi cmake_src_configure |