summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorAdam J. Stewart <ajstewart426@gmail.com>2016-09-22 13:50:50 -0500
committerTodd Gamblin <tgamblin@llnl.gov>2016-09-22 11:50:50 -0700
commita638b62ab14117b3d8339f766eb673147ec85be8 (patch)
tree52e359a9eb63356ed22189e4877334a85a0239f4 /var
parentc7860322f5a07450ca7a5a60e97be95eeb33fc23 (diff)
downloadspack-a638b62ab14117b3d8339f766eb673147ec85be8.tar.gz
spack-a638b62ab14117b3d8339f766eb673147ec85be8.tar.bz2
spack-a638b62ab14117b3d8339f766eb673147ec85be8.tar.xz
spack-a638b62ab14117b3d8339f766eb673147ec85be8.zip
Updates to CGAL and ICU4C packages (#1828)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/cgal/package.py49
-rw-r--r--var/spack/repos/builtin/packages/icu4c/package.py19
2 files changed, 42 insertions, 26 deletions
diff --git a/var/spack/repos/builtin/packages/cgal/package.py b/var/spack/repos/builtin/packages/cgal/package.py
index e522b4a5a0..d986f77487 100644
--- a/var/spack/repos/builtin/packages/cgal/package.py
+++ b/var/spack/repos/builtin/packages/cgal/package.py
@@ -22,44 +22,57 @@
# License along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
##############################################################################
-
from spack import *
class Cgal(Package):
- """CGAL is a software project that provides easy access to efficient and
- reliable geometric algorithms in the form of a C++ library. CGAL
- is used in various areas needing geometric computation, such as
- geographic information systems, computer aided design, molecular
- biology, medical imaging, computer graphics, and robotics.
-
+ """The Computational Geometry Algorithms Library (CGAL) is a C++ library
+ that aims to provide easy access to efficient and reliable algorithms in
+ computational geometry. CGAL is used in various areas needing geometric
+ computation, such as geographic information systems, computer aided design,
+ molecular biology, medical imaging, computer graphics, and robotics.
"""
homepage = 'http://www.cgal.org/'
url = 'https://github.com/CGAL/cgal/archive/releases/CGAL-4.7.tar.gz'
+ version('4.9', '7b628db3e5614347f776c046b7666089')
version('4.7', '4826714810f3b4c65cac96b90fb03b67')
version('4.6.3', 'e8ee2ecc8d2b09b94a121c09257b576d')
- # Installation instructions :
- # http://doc.cgal.org/latest/Manual/installation.html
variant('shared', default=True,
description='Enables the build of shared libraries')
variant('debug', default=False,
description='Builds a debug version of the libraries')
+ # Essential Third Party Libraries
depends_on('boost')
- depends_on('mpfr')
depends_on('gmp')
+ depends_on('mpfr')
depends_on('zlib')
- depends_on('cmake', type='build')
+ # depends_on('opengl')
+ depends_on('qt@5:')
- # FIXME : Qt5 dependency missing (needs Qt5 and OpenGL)
- # FIXME : Optional third party libraries missing
+ # Optional Third Party Libraries
+ # depends_on('leda')
+ # depends_on('mpfi')
+ # depends_on('rs')
+ # depends_on('rs3')
+ # depends_on('ntl')
+ # depends_on('eigen')
+ # depends_on('libqglviewer')
+ # depends_on('esbtl')
+ # depends_on('intel-tbb')
+
+ # Build dependencies
+ depends_on('cmake', type='build')
def install(self, spec, prefix):
+ # Installation instructions:
+ # http://doc.cgal.org/latest/Manual/installation.html
options = []
options.extend(std_cmake_args)
+
# CGAL supports only Release and Debug build type. Any other build type
# will raise an error at configure time
if '+debug' in spec:
@@ -72,9 +85,7 @@ class Cgal(Package):
else:
options.append('-DBUILD_SHARED_LIBS:BOOL=OFF')
- build_directory = join_path(self.stage.path, 'spack-build')
- source_directory = self.stage.source_path
- with working_dir(build_directory, create=True):
- cmake(source_directory, *options)
- make()
- make("install")
+ cmake('.', *options)
+
+ make()
+ make('install')
diff --git a/var/spack/repos/builtin/packages/icu4c/package.py b/var/spack/repos/builtin/packages/icu4c/package.py
index 2bcf86cd13..615c59f92d 100644
--- a/var/spack/repos/builtin/packages/icu4c/package.py
+++ b/var/spack/repos/builtin/packages/icu4c/package.py
@@ -28,17 +28,22 @@ from spack import *
class Icu4c(Package):
"""ICU is a mature, widely used set of C/C++ and Java libraries providing
Unicode and Globalization support for software applications.
-
"""
-
homepage = "http://site.icu-project.org/"
- url = "http://downloads.sourceforge.net/project/icu/ICU4C/54.1/icu4c-54_1-src.tgz"
+ url = "http://download.icu-project.org/files/icu4c/57.1/icu4c-57_1-src.tgz"
- version('54_1', 'e844caed8f2ca24c088505b0d6271bc0')
+ version('57.1', '976734806026a4ef8bdd17937c8898b9')
+
+ def url_for_version(self, version):
+ base_url = "http://download.icu-project.org/files/icu4c"
+ return "{0}/{1}/icu4c-{2}-src.tgz".format(
+ base_url, version, version.underscored)
def install(self, spec, prefix):
- cd("source")
- configure("--prefix=%s" % prefix)
+ cd('source')
+
+ configure('--prefix={0}'.format(prefix))
make()
- make("install")
+ make('check')
+ make('install')