hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bump CGAL version (#18693)

Browse source 
* bump CGAL version

* Address reviewer comments

* flake8 fix

* Address reviewer comments

* Address reviewer comments
This commit is contained in:
Sajid Ali 2020-09-16 16:22:40 -05:00 committed by GitHub
parent 635b8243fe
commit 7c23498f1d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 44 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
var/spack/repos/builtin/packages/cgal/package.py
View file

@ -14,8 +14,10 @@ class Cgal(CMakePackage):
molecular biology, medical imaging, computer graphics, and robotics. molecular biology, medical imaging, computer graphics, and robotics.
""" """
homepage = 'http://www.cgal.org/' homepage = 'http://www.cgal.org/'
url = 'https://github.com/CGAL/cgal/releases/download/releases/CGAL-4.11/CGAL-4.11.tar.xz' url = "https://github.com/CGAL/cgal/releases/download/releases/CGAL-5.0.3/CGAL-5.0.3.tar.xz"
version('5.0.3', sha256='e5a3672e35e5e92e3c1b4452cd3c1d554f3177dc512bd98b29edf21866a4288c')
version('5.0', sha256='e1e7e932988c5d149aa471c1afd69915b7603b5b31b9b317a0debb20ecd42dcc')
version('4.13', sha256='3e3dd7a64febda58be54c3cbeba329ab6a73b72d4d7647ba4931ecd1fad0e3bc') version('4.13', sha256='3e3dd7a64febda58be54c3cbeba329ab6a73b72d4d7647ba4931ecd1fad0e3bc')
version('4.12', sha256='442ef4fffb2ad6e4141e5a7902993ae6a4e73f7cb641fae1010bb586f6ca5e3f') version('4.12', sha256='442ef4fffb2ad6e4141e5a7902993ae6a4e73f7cb641fae1010bb586f6ca5e3f')
version('4.11', sha256='27a7762e5430f5392a1fe12a3a4abdfe667605c40224de1c6599f49d66cfbdd2') version('4.11', sha256='27a7762e5430f5392a1fe12a3a4abdfe667605c40224de1c6599f49d66cfbdd2')
@ -29,6 +31,8 @@ class Cgal(CMakePackage):
variant('build_type', default='Release', variant('build_type', default='Release',
description='The build type to build', description='The build type to build',
values=('Debug', 'Release')) values=('Debug', 'Release'))
variant('header-only', default=False,
description='Install in header only mode')
# ---- See "7 CGAL Libraries" at: # ---- See "7 CGAL Libraries" at:
# http://doc.cgal.org/latest/Manual/installation.html # http://doc.cgal.org/latest/Manual/installation.html
@ -42,6 +46,8 @@ class Cgal(CMakePackage):
description='Build utilities to read/write image files') description='Build utilities to read/write image files')
variant('demos', default=False, variant('demos', default=False,
description='Build CGAL demos') description='Build CGAL demos')
variant('eigen', default=True,
description='Build with Eigen support')
depends_on('cmake@2.8.11:', type='build') depends_on('cmake@2.8.11:', type='build')
@ -59,28 +65,53 @@ class Cgal(CMakePackage):
depends_on('qt@5:', when='+demos') depends_on('qt@5:', when='+demos')
# Optional Third Party Libraries # Optional Third Party Libraries
depends_on('eigen', when='+eigen')
# depends_on('leda') # depends_on('leda')
# depends_on('mpfi') # depends_on('mpfi')
# depends_on('rs') # depends_on('rs')
# depends_on('rs3') # depends_on('rs3')
# depends_on('ntl') # depends_on('ntl')
# depends_on('eigen')
# depends_on('libqglviewer') # depends_on('libqglviewer')
# depends_on('esbtl') # depends_on('esbtl')
# depends_on('intel-tbb') # depends_on('intel-tbb')
conflicts('~header_only', when='@:4.9',
msg="Header only builds became optional in 4.9,"
" default thereafter")
def setup_build_environment(self, env):
spec = self.spec
env.set('BOOST_INCLUDEDIR', spec['boost'].headers.directories[0])
env.set('BOOST_LIBRARYDIR', spec['boost'].libs.directories[0])
if '+eigen' in spec:
env.set('EIGEN3_INC_DIR', spec['eigen'].headers.directories[0])
def cmake_args(self): def cmake_args(self):
# Installation instructions: # Installation instructions:
# http://doc.cgal.org/latest/Manual/installation.html # http://doc.cgal.org/latest/Manual/installation.html
spec = self.spec spec = self.spec
variant_bool = lambda feature: str(feature in spec)
cmake_args = []
return [ cmake_args.append(
'-DBUILD_SHARED_LIBS:BOOL=%s' % '-DBUILD_SHARED_LIBS:BOOL=%s' % variant_bool('+shared')
('ON' if '+shared' in spec else 'OFF'), )
'-DWITH_CGAL_Core:BOOL=%s' % cmake_args.append(
('YES' if '+core' in spec else 'NO'), '-DWITH_CGAL_Core:BOOL=%s' % variant_bool('+core')
'-DWITH_CGAL_ImageIO:BOOL=%s' % )
('YES' if '+imageio' in spec else 'NO'), cmake_args.append(
'-DWITH_CGAL_Qt5:BOOL=%s' % '-DWITH_CGAL_ImageIO:BOOL=%s' % variant_bool('+imageio')
('YES' if '+demos' in spec else 'NO'), )
] cmake_args.append(
'-DWITH_CGAL_Qt5:BOOL=%s' % variant_bool('+demos')
)
if spec.satisfies('@4.9:'):
cmake_args.append(
'-DCGAL_HEADER_ONLY:BOOL=%s' % variant_bool('+header_only')
)
return cmake_args