Skip to content

Commit

Permalink
Fix linter errors
Browse files Browse the repository at this point in the history
  • Loading branch information
lelandaisb committed Aug 9, 2024
1 parent 151b0a6 commit 5770dfc
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 13 deletions.
3 changes: 2 additions & 1 deletion meshing_supersede/packages/cgal/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,8 @@ def cmake_args(self):
# Installation instructions:
# https://doc.cgal.org/latest/Manual/installation.html
spec = self.spec
def variant_bool(feature): str(feature in spec)
def variant_bool(feature):
str(feature in spec)
cmake_args = []

cmake_args.append("-DBUILD_SHARED_LIBS:BOOL=%s" % variant_bool("+shared"))
Expand Down
21 changes: 9 additions & 12 deletions meshing_supersede/packages/opencascade/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ class Opencascade(CMakePackage):


##############################################
# WARNING this supersedes the upstream recipe
# WARNING this supersedes the upstream recipe
##############################################

homepage = "https://www.opencascade.com"
url = "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V7_1_0;sf=tgz"
url = "https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V7_1_0;sf=tgz"

# version('7.4.0', extension='tar.gz',
# sha256='1eace85115ea178f268e9d803ced994b66b72455b5484074b6ad7f643261f0a0')
Expand All @@ -38,7 +38,7 @@ def url_for_version(self, version):

# modifications for internal use
patch('opencascade-7.1.0_a.patch', when='@7.1.0')

variant('tbb', default=False,
description='Build with Intel Threading Building Blocks')
variant('vtk', default=False,
Expand All @@ -60,14 +60,13 @@ def url_for_version(self, version):
variant('draw', default=False,
description='Sets BUILD_MODULE_Draw')
variant('foundationclasses', default=False,
description='Sets BUILD_MODULE_FoundationClasses (probably always ON)' )
description='Sets BUILD_MODULE_FoundationClasses (probably always ON)')
variant('modelingalgorithm', default=False,
description='Sets BUILD_MODULE_ModelingAlgorithm')
variant('modelingdata', default=False,
description='Sets BUILD_MODULE_ModelingData')
variant('visualization', default=False,
description='Sets BUILD_MODULE_Visualization')


depends_on('intel-tbb', when='+tbb')
depends_on('vtk', when='+vtk')
Expand All @@ -76,7 +75,6 @@ def url_for_version(self, version):
depends_on('gl2ps', when='@7.1.0+gl2ps')
depends_on('doxygen', when='+documentation')


depends_on('freetype')
depends_on('tcl')

Expand All @@ -87,11 +85,11 @@ def url_for_version(self, version):

depends_on('gl')

# those two libraries are always used at link phase, but it could be a
# remnant of the optionnal gl2ps module. We might be able to remove
# those two libraries are always used at link phase, but it could be a
# remnant of the optionnal gl2ps module. We might be able to remove
# those dependencies in a future release of OCC.
depends_on('libxmu', type=('build','link'))
depends_on('libxi', type=('build','link'))
depends_on('libxmu', type=('build', 'link'))
depends_on('libxi', type=('build', 'link'))

def cmake_args(self):
args = []
Expand Down Expand Up @@ -131,7 +129,6 @@ def cmake_args(self):
else:
args.append('-DUSE_GL2PS=OFF')


if '+documentation' in self.spec:
args.append('-DBUILD_DOC_Overview=ON')
else:
Expand All @@ -151,7 +148,7 @@ def cmake_args(self):
args.append('-DBUILD_MODULE_Draw=ON')
else:
args.append('-DBUILD_MODULE_Draw=OFF')

if '+foundationclasses' in self.spec:
args.append('-DBUILD_MODULE_FoundationClasses=ON')
else:
Expand Down

0 comments on commit 5770dfc

Please sign in to comment.