From 0157d0783d3b4ef476477f9d38a5ec09902dc92a Mon Sep 17 00:00:00 2001 From: nicolas le goff Date: Sun, 8 Oct 2023 22:14:22 +0200 Subject: [PATCH] added guiltoolkitsvariables dependency in recipes --- meshing/packages/magix3d/package.py | 1 + meshing/packages/preferences/package.py | 1 + meshing/packages/pythonutil/package.py | 1 + meshing/packages/qqualif/package.py | 2 +- meshing/packages/qtpython/package.py | 1 + meshing/packages/qtutil/package.py | 2 +- meshing/packages/qtvtk/package.py | 1 + meshing/packages/qwtcharts/package.py | 5 ++--- meshing/packages/vtkcontrib/package.py | 2 +- 9 files changed, 10 insertions(+), 6 deletions(-) diff --git a/meshing/packages/magix3d/package.py b/meshing/packages/magix3d/package.py index d0cd19f..4d752fe 100644 --- a/meshing/packages/magix3d/package.py +++ b/meshing/packages/magix3d/package.py @@ -25,6 +25,7 @@ class Magix3d(CMakePackage): version('2.2.6', sha256='9d39dd74a1b9360a5ca2790f2d9e8b17429f82833df2d633b57c866383873d05') version('2.2.5') + depends_on('guitoolkitsvariables', type=('build')) depends_on('tkutil') depends_on('vtkcontrib@4: +shared', type=('build', 'link')) depends_on('preferences@5: +shared', type=('build', 'link')) diff --git a/meshing/packages/preferences/package.py b/meshing/packages/preferences/package.py index ee8e714..f40e811 100644 --- a/meshing/packages/preferences/package.py +++ b/meshing/packages/preferences/package.py @@ -17,6 +17,7 @@ class Preferences(CMakePackage): maintainers = ['meshing_team'] + depends_on('guitoolkitsvariables', type=('build')) depends_on('qtutil@5: +shared', type=('build', 'link'), when='+shared') depends_on('qtutil@5: ~shared', type=('build', 'link'), when='~shared') depends_on('tkutil') diff --git a/meshing/packages/pythonutil/package.py b/meshing/packages/pythonutil/package.py index ed21033..4707482 100644 --- a/meshing/packages/pythonutil/package.py +++ b/meshing/packages/pythonutil/package.py @@ -12,6 +12,7 @@ class Pythonutil(CMakePackage): git = 'https://github.com/LIHPC-Computational-Geometry/pythonutil.git' maintainers = ['meshing_team'] + depends_on('guitoolkitsvariables', type=('build')) depends_on('tkutil') depends_on('python', type=('build', 'link')) # On a besoin de swig >= 3.0.0 : diff --git a/meshing/packages/qqualif/package.py b/meshing/packages/qqualif/package.py index be9fc1e..800a266 100644 --- a/meshing/packages/qqualif/package.py +++ b/meshing/packages/qqualif/package.py @@ -16,7 +16,7 @@ class Qqualif(CMakePackage): git = 'https://github.com/LIHPC-Computational-Geometry/qqualif.git' maintainers = ['meshing_team'] -# On a besoin de 5.0 <= tkutil : + depends_on('guitoolkitsvariables', type=('build')) depends_on('qwtcharts@4: ~shared', type=('build', 'link'), when='~shared') depends_on('qwtcharts@4: +shared', type=('build', 'link'), when='+shared') depends_on('vtkcontrib@4: ~shared', type=('build', 'link'), when='~shared+vtk') diff --git a/meshing/packages/qtpython/package.py b/meshing/packages/qtpython/package.py index a6ecf65..f63e8ca 100644 --- a/meshing/packages/qtpython/package.py +++ b/meshing/packages/qtpython/package.py @@ -16,6 +16,7 @@ class Qtpython(CMakePackage): git = 'https://github.com/LIHPC-Computational-Geometry/qtpython.git' maintainers = ['meshing_team'] + depends_on('guitoolkitsvariables', type=('build')) depends_on('qtutil@5: +shared', type=('build', 'link'), when='+shared') depends_on('qtutil@5: ~shared', type=('build', 'link'), when='~shared') depends_on('pythonutil@5: +shared', type=('build', 'link'), when='+shared') diff --git a/meshing/packages/qtutil/package.py b/meshing/packages/qtutil/package.py index b50a08c..96e9a39 100755 --- a/meshing/packages/qtutil/package.py +++ b/meshing/packages/qtutil/package.py @@ -16,7 +16,7 @@ class Qtutil(CMakePackage): git = 'https://github.com/LIHPC-Computational-Geometry/qtutil.git' maintainers = ['meshing_team'] -# On a besoin de 5.0 <= tkutil : + depends_on('guitoolkitsvariables', type=('build')) depends_on('tkutil@5: +shared', type=('build', 'link'), when='+shared') depends_on('tkutil@5: ~shared', type=('build', 'link'), when='~shared') depends_on('qt@5.9:', type=('build', 'link')) diff --git a/meshing/packages/qtvtk/package.py b/meshing/packages/qtvtk/package.py index ededde5..164cc52 100644 --- a/meshing/packages/qtvtk/package.py +++ b/meshing/packages/qtvtk/package.py @@ -16,6 +16,7 @@ class Qtvtk(CMakePackage): git = 'https://github.com/LIHPC-Computational-Geometry/qtvtk.git' maintainers = ['meshing_team'] + depends_on('guitoolkitsvariables', type=('build')) depends_on('qtutil@5: +shared', type=('build', 'link'), when='+shared') depends_on('qtutil@5: ~shared', type=('build', 'link'), when='~shared') depends_on('vtkcontrib@4: +shared', type=('build', 'link'), when='+shared') diff --git a/meshing/packages/qwtcharts/package.py b/meshing/packages/qwtcharts/package.py index 7eb7c80..accb7c0 100755 --- a/meshing/packages/qwtcharts/package.py +++ b/meshing/packages/qwtcharts/package.py @@ -15,11 +15,10 @@ class Qwtcharts(CMakePackage): url = 'https://github.com/LIHPC-Computational-Geometry/qwtcharts/archive/refs/tags/5.2.1.tar.gz' git = 'https://github.com/LIHPC-Computational-Geometry/qwtcharts.git' maintainers = ['meshing_team'] - -# On a besoin de 5.0 <= tkutil : + + depends_on('guitoolkitsvariables', type=('build')) depends_on('qtutil@5: +shared', type=('build', 'link'), when='+shared') depends_on('qtutil@5: ~shared', type=('build', 'link'), when='~shared') -# depends_on('qt@5.9:', type=('build', 'link')) depends_on('qwt@6.1:', type=('build', 'link')) version('5.2.1', sha256='fda34002a9631f7afcdb7cc4baaca81d09cacb0cd05b10fe08af86f091eddad5') diff --git a/meshing/packages/vtkcontrib/package.py b/meshing/packages/vtkcontrib/package.py index f6c477a..e19502e 100644 --- a/meshing/packages/vtkcontrib/package.py +++ b/meshing/packages/vtkcontrib/package.py @@ -20,7 +20,7 @@ class Vtkcontrib(CMakePackage): # On veut dans cette version un VTK 7.* # depends_on('vtk@7.1:7.99~opengl2~python~xdmf+qt', type=('build', 'link')) # depends_on('qt@5.9.1', type=('build', 'link')) - depends_on('guitoolkitsvariables', type=('build', 'link')) + depends_on('guitoolkitsvariables', type=('build')) depends_on('vtk-maillage', type=('build', 'link')) # depends_on('mpi', type=('build', 'link'))