From d48a7c9de210ee8768487fb7417e71c3903c6c8c Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Fri, 25 Nov 2016 17:33:13 +0100 Subject: [PATCH] Compiler/vtk/build - dependencies are now defined in variants file --- Compiler/vtk/5/variants.Linux | 10 ++++++++++ Compiler/vtk/6/variants.Linux | 1 + Compiler/vtk/7/variants.Linux | 1 + Compiler/vtk/build | 4 ++-- 4 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 Compiler/vtk/5/variants.Linux create mode 100644 Compiler/vtk/6/variants.Linux create mode 100644 Compiler/vtk/7/variants.Linux diff --git a/Compiler/vtk/5/variants.Linux b/Compiler/vtk/5/variants.Linux new file mode 100644 index 0000000..ea19eb6 --- /dev/null +++ b/Compiler/vtk/5/variants.Linux @@ -0,0 +1,10 @@ +vtk/5.10.1 stable b:cmake/2.8.12.2 gcc/4.7.4 +vtk/5.10.1 stable b:cmake/2.8.12.2 gcc/4.8.3 +vtk/5.10.1 stable b:cmake/3.1.3 gcc/4.8.4 +vtk/5.10.1 stable b:cmake/3.4.1 gcc/4.8.5 +vtk/5.10.1 stable b:cmake/3.1.3 gcc/4.9.2 +vtk/5.10.1 stable b:cmake/3.6.3 gcc/4.9.4 +vtk/5.10.1 stable b:cmake/3.6.3 gcc/5.3.0 +vtk/5.10.1 stable b:cmake/3.6.3 gcc/6.2.0 + +vtk/5.10.1 unstable b:cmake/3.1.3 intel/15.3 diff --git a/Compiler/vtk/6/variants.Linux b/Compiler/vtk/6/variants.Linux new file mode 100644 index 0000000..6f70840 --- /dev/null +++ b/Compiler/vtk/6/variants.Linux @@ -0,0 +1 @@ +vtk/6.3.0 unstable b:cmake/3.6.3 gcc/6.2.0 diff --git a/Compiler/vtk/7/variants.Linux b/Compiler/vtk/7/variants.Linux new file mode 100644 index 0000000..f4c4034 --- /dev/null +++ b/Compiler/vtk/7/variants.Linux @@ -0,0 +1 @@ +vtk/7.0.0 unstable b:cmake/3.6.3 gcc/6.2.0 diff --git a/Compiler/vtk/build b/Compiler/vtk/build index e923a58..2760004 100755 --- a/Compiler/vtk/build +++ b/Compiler/vtk/build @@ -6,6 +6,8 @@ # and remove these strings. # +SOURCE_URL="http://www.vtk.org/files/release/${V_MAJOR}.${V_MINOR}/VTK-$V.tar.gz" + case ${OS} in Darwin ) pbuild::pre_configure() { @@ -25,7 +27,5 @@ pbuild::configure() { } pbuild::add_to_group 'Compiler' -pbuild::set_runtime_dependencies "${COMPILER}" -pbuild::set_build_dependencies 'cmake' "${COMPILER}" pbuild::make_all