Skip to content

Commit 58fef0f

Browse files
author
Charles PIGNEROL
committed
QtPython 6.4.1 update + QtUtil in/out synchronization.
1 parent 85c7f95 commit 58fef0f

File tree

3 files changed

+35
-3
lines changed

3 files changed

+35
-3
lines changed
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# -*- coding: utf-8 -*-
2+
##############################################################################
3+
# Project CorbaUtil
4+
#
5+
# REPLACE_NAME_SERVICE_LABO, 2020
6+
##############################################################################
7+
8+
from spack import *
9+
10+
11+
class Corbautil(CMakePackage):
12+
"""Bibliotheque d'utilitaires CORBA"""
13+
14+
homepage = ''
15+
url = 'corbautil-6.2.1.tar.gz'
16+
git = ''
17+
maintainers = ['meshing_team']
18+
19+
depends_on('guitoolkitsvariables', type=('build'))
20+
depends_on('tkutil@6: +shared', type=('build', 'link'), when='+shared')
21+
depends_on('tkutil@6: ~shared', type=('build', 'link'), when='~shared')
22+
depends_on('[email protected]:', type=('build', 'link', 'run'))
23+
version('6.2.1', sha256='41aaf5a3c582ec0fe3467aaf95eb24b72b1336ce31718153877a3bb34c775cc2')
24+
25+
variant('shared', default=True, description='Creation de bibliotheques dynamiques')
26+
27+
def cmake_args(self):
28+
args = []
29+
args = [self.define_from_variant('BUILD_SHARED_LIBS', 'shared')]
30+
31+
return args

meshing/packages/qtpython/package.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ class Qtpython(CMakePackage):
3232

3333
variant('shared', default=True, description='Creation de bibliotheques dynamiques (defaut:shared, annuler le defaut par ~shared)')
3434

35+
version('6.4.1', sha256='6401ff25e6942e9d8de7195dc9fe50b89734f6317d654afc85655d6f4834957f')
3536
version('6.4.0', sha256='0ec68d7699450ef924cd1ab4c333cd1045451aa698a09184af56cc2f3db89c04')
3637
version('6.3.3', sha256='060eb5832f39e1bd4c78e1abab7fad7dbcff2b098c9ac0764b6015bf46209d5b')
3738
version('6.3.2', sha256='9abf42ee139fa392179e4b969b7bcf70cde9436ac7b02f3fb07e4e0077b17624')

meshing/packages/qtutil/package.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ class Qtutil(CMakePackage):
3232
version('5.0.2', sha256='9ca1d5fd687d90398ca45ca3e1a07f9d7c0b591943d231e8c088e026cb4d7cc2')
3333
version('5.0.0', sha256='c15f4c25a3db68ed90dc7ded6b53085a3f66181972936cdc247818b17f94dc21')
3434

35-
variant('shared', default=True, description='Creation de bibliotheques dynamiques')
35+
variant('shared', default=True, description='Création de bibliothèques dynamiques')
3636

3737
# to avoid QtWebEngine or QtWebkit
3838
variant('qtbrowser', default=True, description='Use Qt base browser')
3939

4040
def cmake_args(self):
4141
args = []
42-
args.append(self.define_from_variant('BUILD_SHARED_LIBS', 'shared'))
43-
args.append(self.define_from_variant('USE_QT_TEXT_BROWSER', 'qtbrowser'))
42+
args += [self.define_from_variant('BUILD_SHARED_LIBS', 'shared')]
43+
args += [self.define_from_variant('USE_QT_TEXT_BROWSER', 'qtbrowser')]
4444

4545
return args

0 commit comments

Comments
 (0)