diff options
| author |   Bernd Waibel <waebbl-gentoo@posteo.net> | 2023-01-02 08:57:00 +0100 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2023-01-04 05:48:11 +0000 |
| commit | 0d7bfedb0301cadcf0e96cec0eb182ab1f471553 (patch) | |
| tree | 2faffe19529e1f8748892e1fe18289615ee1ac50 | |
| parent | sci-libs/opencascade: simplify vtk logic (v7.7.0) (diff) | |
| download | gentoo-0d7bfedb0301cadcf0e96cec0eb182ab1f471553.tar.gz gentoo-0d7bfedb0301cadcf0e96cec0eb182ab1f471553.tar.bz2 gentoo-0d7bfedb0301cadcf0e96cec0eb182ab1f471553.zip | |
sci-libs/opencascade: simplify vtk logic (v7.6.3)
Backport patch from v7.7.0
Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/28932
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | sci-libs/opencascade/opencascade-7.6.3-r1.ebuild | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sci-libs/opencascade/opencascade-7.6.3-r1.ebuild b/sci-libs/opencascade/opencascade-7.6.3-r1.ebuild index 2090e9b45195..82352ba3e3a2 100644 --- a/sci-libs/opencascade/opencascade-7.6.3-r1.ebuild +++ b/sci-libs/opencascade/opencascade-7.6.3-r1.ebuild @@ -132,17 +132,14 @@ src_configure() { fi if use vtk; then + local vtk_ver=$(best_version "sci-libs/vtk") + vtk_ver=${vtk_ver#sci-libs/vtk-} + vtk_ver=$(ver_cut 1-2 ${vtk_ver}) mycmakeargs+=( -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr + -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-${vtk_ver} -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir) ) - if has_version ">=sci-libs/vtk-9.2.0"; then - mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.2 ) - elif has_version ">=sci-libs/vtk-9.1.0"; then - mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.1 ) - elif has_version ">=sci-libs/vtk-9.0.0"; then - mycmakeargs+=( -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.0 ) - fi fi cmake_src_configure |