added new project machine_types and removed internal machine_types fr…

…om smooth3d
LIHPC-Computational-Geometry · Feb 20, 2024 · 8e22875 · 8e22875
1 parent 9b17c81
commit 8e22875
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/dockerfiles/mirror.sh b/dockerfiles/mirror.sh
@@ -4,7 +4,7 @@
 # INSTALL_DIR is defined in the containers using this script
 
 GH_BASE=https://github.com/LIHPC-Computational-Geometry
-PRJS=(guitoolkitsvariables tkutil qtutil lima pythonutil preferences qualif qwtcharts gmds072 gmdscea qtpython triton2 vtkcontrib qtvtk qqualif smooth3d magix3d)
+PRJS=(guitoolkitsvariables tkutil qtutil lima pythonutil preferences qualif qwtcharts gmds072 gmdscea qtpython triton2 vtkcontrib qtvtk qqualif machine_types smooth3d magix3d)
 
 print_usage() {
 	echo "Usage:"

diff --git a/meshing/packages/machine-types/package.py b/meshing/packages/machine-types/package.py
@@ -14,5 +14,4 @@ class MachineTypes(CMakePackage):
     url = 'https://github.com/LIHPC-Computational-Geometry/machine_types/archive/refs/tags/0.0.0.tar.gz'
     git = 'https://github.com/LIHPC-Computational-Geometry/machine_types.git'
 
-    version('2.0.0')
-
+    version('2.0.0', sha256="15f2c41531d8ee70c45ca98a9ab1e1d1845403d75be4e2a7aa2b3335ade2d922")
diff --git a/meshing/packages/smooth3d/package.py b/meshing/packages/smooth3d/package.py
@@ -19,23 +19,22 @@ class Smooth3d(CMakePackage):
     git = 'https://github.com/LIHPC-Computational-Geometry/smooth3d.git'
     maintainers = ['meshing_team']
 
+    version('3.3.0', sha256='2b392a2a4ed7b58ea503b423335369edf727e7c8e8054b2a321d4a2160b95a64')
     version('3.2.1', sha256='e26fde58bebdf64134ae52fb6d1d1e95490c725a479370038c3093a46de4c837')
     version('3.2.0', sha256='5e0132a5a6c75d18247db1fccfd7d64cdca7d9a8bb44c246616527a92fe809ea')
     version('3.0.2')#, sha256='0be62f149fa154621dbdeefdf00d026bb2bd26ff7bd88c8560bce652ff209038')
     version('3.0.1', sha256='534f067951629e5697a04d7965487193659877b0ec8dbdd1ed0200a01d60907d')
     version('3.0.0', sha256='9ef4b2e380c507cc14883a6233c1df933bf3fc49549fd7e3f87630ae2abb6c82')
 
     variant('shared', default=True, description='Build as a shared library.')
-    variant('machinetypes', default=False, description='Links with an external machinetypes.')
 
     depends_on('gmds')
     depends_on('mesquite')
     depends_on('lima')
-    depends_on('machine-types', when='+machinetypes')
+    depends_on('machine-types')
 
     def cmake_args(self):
         args = []
         args.append(self.define_from_variant('BUILD_SHARED_LIBS', 'shared'))
-        args.append(self.define_from_variant('WITH_EXTERNAL_MACHINETYPES', 'machinetypes'))
 
         return args