commit: d8e72a84aebb1ac6094257935e5c5a589da1870c Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net> AuthorDate: Thu May 6 21:37:40 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu May 6 21:42:42 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8e72a84
media-gfx/freecad: find opencascade-7.5 Correctly find sci-libs/opencascade-7.5.1 header and library locations. Closes: https://bugs.gentoo.org/788274 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net> Closes: https://github.com/gentoo/gentoo/pull/20708 Signed-off-by: Sam James <sam <AT> gentoo.org> media-gfx/freecad/freecad-0.19.2.ebuild | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/media-gfx/freecad/freecad-0.19.2.ebuild b/media-gfx/freecad/freecad-0.19.2.ebuild index f2d55fb7b13..f7125e38c85 100644 --- a/media-gfx/freecad/freecad-0.19.2.ebuild +++ b/media-gfx/freecad/freecad-0.19.2.ebuild @@ -222,11 +222,22 @@ src_configure() { # sub-packages will still be installed inside /usr/lib64/freecad -DINSTALL_TO_SITEPACKAGES=ON - -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade - -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir) -DOCCT_CMAKE_FALLBACK=ON # don't use occt-config which isn't included in opencascade for Gentoo ) + if has_version ">=sci-libs/opencascade-7.5"; 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_INCLUDEDIR="${CASROOT}"/include/opencascade + -DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir) + ) + fi + if use debug; then mycmakeargs+=( -DBUILD_SANDBOX=ON
