summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Ammerlaan <andrewammerlaan@gentoo.org>2022-12-13 14:30:34 +0100
committerAndrew Ammerlaan <andrewammerlaan@gentoo.org>2022-12-13 14:36:52 +0100
commitb1c6afa07316c3b71e4a4c37637b69a351d49ac0 (patch)
tree90c83745df77bdeb98a9ac7871ac61b688672d47 /sci-libs
parentdev-python/pyside6-tools: add 6.4.1 (diff)
downloadgentoo-b1c6afa07316c3b71e4a4c37637b69a351d49ac0.tar.gz
gentoo-b1c6afa07316c3b71e4a4c37637b69a351d49ac0.tar.bz2
gentoo-b1c6afa07316c3b71e4a4c37637b69a351d49ac0.zip
sci-libs/opencascade: ensure vtk include dirs are found
Closes: https://bugs.gentoo.org/885621 Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/opencascade/opencascade-7.5.2-r6.ebuild2
-rw-r--r--sci-libs/opencascade/opencascade-7.5.3-r8.ebuild2
-rw-r--r--sci-libs/opencascade/opencascade-7.6.3.ebuild2
-rw-r--r--sci-libs/opencascade/opencascade-7.7.0.ebuild10
4 files changed, 11 insertions, 5 deletions
diff --git a/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild b/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
index d4500132ab1f..f2acaba15e74 100644
--- a/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.2-r6.ebuild
@@ -48,7 +48,7 @@ RDEPEND="
ffmpeg? ( media-video/ffmpeg:= )
freeimage? ( media-libs/freeimage )
tbb? ( <dev-cpp/tbb-2021.4.0 )
- vtk? ( sci-libs/vtk:=[rendering] )
+ vtk? ( <sci-libs/vtk-9.2.0:=[rendering] )
"
DEPEND="${RDEPEND}"
diff --git a/sci-libs/opencascade/opencascade-7.5.3-r8.ebuild b/sci-libs/opencascade/opencascade-7.5.3-r8.ebuild
index 87b782fa5e6a..bdd9b918a69a 100644
--- a/sci-libs/opencascade/opencascade-7.5.3-r8.ebuild
+++ b/sci-libs/opencascade/opencascade-7.5.3-r8.ebuild
@@ -48,7 +48,7 @@ RDEPEND="
ffmpeg? ( media-video/ffmpeg:= )
freeimage? ( media-libs/freeimage )
tbb? ( dev-cpp/tbb:= )
- vtk? ( sci-libs/vtk:=[rendering] )
+ vtk? ( <sci-libs/vtk-9.2.0:=[rendering] )
"
DEPEND="${RDEPEND}"
diff --git a/sci-libs/opencascade/opencascade-7.6.3.ebuild b/sci-libs/opencascade/opencascade-7.6.3.ebuild
index 398ea6df2e54..cd7888f8818b 100644
--- a/sci-libs/opencascade/opencascade-7.6.3.ebuild
+++ b/sci-libs/opencascade/opencascade-7.6.3.ebuild
@@ -49,7 +49,7 @@ RDEPEND="
ffmpeg? ( <media-video/ffmpeg-5:= )
freeimage? ( media-libs/freeimage )
tbb? ( dev-cpp/tbb:= )
- vtk? ( sci-libs/vtk:=[rendering] )
+ vtk? ( <sci-libs/vtk-9.2.0:=[rendering] )
"
DEPEND="
${RDEPEND}
diff --git a/sci-libs/opencascade/opencascade-7.7.0.ebuild b/sci-libs/opencascade/opencascade-7.7.0.ebuild
index 072150e2df0a..c2f7e7dbf7a4 100644
--- a/sci-libs/opencascade/opencascade-7.7.0.ebuild
+++ b/sci-libs/opencascade/opencascade-7.7.0.ebuild
@@ -45,7 +45,7 @@ RDEPEND="
ffmpeg? ( <media-video/ffmpeg-5:= )
freeimage? ( media-libs/freeimage )
tbb? ( dev-cpp/tbb:= )
- vtk? ( sci-libs/vtk:=[rendering] )
+ vtk? ( <sci-libs/vtk-9.3.0:=[rendering] )
"
DEPEND="
${RDEPEND}
@@ -132,7 +132,13 @@ src_configure() {
fi
if use vtk; then
- if has_version ">=sci-libs/vtk-9.1.0"; then
+ if has_version ">=sci-libs/vtk-9.2.0"; then
+ mycmakeargs+=(
+ -D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
+ -D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.2
+ -D3RDPARTY_VTK_LIBRARY_DIR="${ESYSROOT}"/usr/$(get_libdir)
+ )
+ elif has_version ">=sci-libs/vtk-9.1.0"; then
mycmakeargs+=(
-D3RDPARTY_VTK_DIR="${ESYSROOT}"/usr
-D3RDPARTY_VTK_INCLUDE_DIR="${ESYSROOT}"/usr/include/vtk-9.1