diff options
| author | Florian Franzmann | 2016-08-27 22:38:22 +0200 |
|---|---|---|
| committer | Florian Franzmann | 2016-09-06 18:11:39 +0200 |
| commit | 1f553aa0e7143d4706ac5c088c38833405c85508 (patch) | |
| tree | 534611a4e658baa126b092f7ac7c49b1cef4bc71 /science-libs | |
| parent | 6891dd8c6422bfb3413404136135acaf1d71bf1a (diff) | |
science-libs/opencascade: add optional dependency on vtk
Diffstat (limited to 'science-libs')
| -rwxr-xr-x | science-libs/opencascade/BUILD | 2 | ||||
| -rwxr-xr-x | science-libs/opencascade/DEPENDS | 10 | ||||
| -rw-r--r-- | science-libs/opencascade/HISTORY | 4 | ||||
| -rwxr-xr-x | science-libs/opencascade/PRE_SUB_DEPENDS | 5 | ||||
| -rwxr-xr-x | science-libs/opencascade/SUB_DEPENDS | 7 |
5 files changed, 22 insertions, 6 deletions
diff --git a/science-libs/opencascade/BUILD b/science-libs/opencascade/BUILD index f5c92c2da5..e81b318c0b 100755 --- a/science-libs/opencascade/BUILD +++ b/science-libs/opencascade/BUILD @@ -1,2 +1,2 @@ -OPTS+=" -DUSE_FREEIMAGE=off -DUSE_VTK=off" && +OPTS+=" -DUSE_FREEIMAGE=off" && cmake_build diff --git a/science-libs/opencascade/DEPENDS b/science-libs/opencascade/DEPENDS index 8b77e50004..06a0fb0d36 100755 --- a/science-libs/opencascade/DEPENDS +++ b/science-libs/opencascade/DEPENDS @@ -18,8 +18,8 @@ optional_depends gl2ps \ optional_depends tbb \ "-DUSE_TBB=on" \ "-DUSE_TBB=off" \ - "for multithreading" -#optional_depends vtk \ -# "-DUSE_VTK=on -D3RDPARTY_VTK_INCLUDE_DIR=${TRACK_ROOT}/opt/qt5/include/vtk-7.0 -D3RDPARTY_VTK_LIBRARY_DIR=${TRACK_ROOT}/opt/qt5/lib" \ -# "-DUSE_VTK=off" \ -# "for visualization support" + "for multithreading" && +optional_depends vtk \ + "-DUSE_VTK=on -D3RDPARTY_VTK_INCLUDE_DIR=${TRACK_ROOT}/opt/qt5/include/vtk-7.0 -D3RDPARTY_VTK_LIBRARY_DIR=${TRACK_ROOT}/opt/qt5/lib" \ + "-DUSE_VTK=off" \ + "for visualization support" diff --git a/science-libs/opencascade/HISTORY b/science-libs/opencascade/HISTORY index b8775f56f0..e00a135993 100644 --- a/science-libs/opencascade/HISTORY +++ b/science-libs/opencascade/HISTORY @@ -1,3 +1,7 @@ +2016-08-27 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * BUILD, DEPENDS, SUB_DEPENDS, PRE_SUB_DEPENDS: add optional dependency on + vtk + 2016-08-22 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * BUILD, DEPENDS, DETAILS: spell created diff --git a/science-libs/opencascade/PRE_SUB_DEPENDS b/science-libs/opencascade/PRE_SUB_DEPENDS new file mode 100755 index 0000000000..95b7378d84 --- /dev/null +++ b/science-libs/opencascade/PRE_SUB_DEPENDS @@ -0,0 +1,5 @@ +case $THIS_SUB_DEPENDS in + VTK) is_depends_enabled $SPELL vtk && return 0;; + *) echo "Eek, unknown subdependency requested!"; return 1;; +esac +return 1 diff --git a/science-libs/opencascade/SUB_DEPENDS b/science-libs/opencascade/SUB_DEPENDS new file mode 100755 index 0000000000..b1d358493e --- /dev/null +++ b/science-libs/opencascade/SUB_DEPENDS @@ -0,0 +1,7 @@ +case $THIS_SUB_DEPENDS in +VTK) echo "VTK support requested, forcing vtk dependency." && + depends vtk + ;; + +*) echo unknown sub-depends!!! ; return 1 ;; +esac |