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

flann: fix build for 1.8.1 (#5508)

Browse source 
* Update url_for_version for versions 1.8.1 and earlier
* Add python dependency when +python is enabled
This commit is contained in:
Christoph Junghans 2017-09-27 15:39:33 -06:00 committed by scheibelp
parent 83ab062583
commit f27aad68bf
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
var/spack/repos/builtin/packages/flann/package.py
View file

@ -46,11 +46,18 @@ class Flann(CMakePackage):
version('1.8.1', '1f51500e172f5e11fbda05f033858eb6') version('1.8.1', '1f51500e172f5e11fbda05f033858eb6')
version('1.8.0', '473150f592c2997e32d5ce31fd3c19a2') version('1.8.0', '473150f592c2997e32d5ce31fd3c19a2')
def url_for_version(self, version):
if version > Version('1.8.1'):
return "https://github.com/mariusmuja/flann/archive/{0}.tar.gz".format(version)
else:
return "https://github.com/mariusmuja/flann/archive/{0}-src.tar.gz".format(version)
# Options available in the CMakeLists.txt # Options available in the CMakeLists.txt
# Language bindings # Language bindings
variant("python", default=False, variant("python", default=False,
description="Build the Python bindings. " description="Build the Python bindings. "
"Module: pyflann.") "Module: pyflann.")
extends('python', when='+python')
variant("matlab", default=False, description="Build the Matlab bindings.") variant("matlab", default=False, description="Build the Matlab bindings.")
# default to true for C because it's a C++ library, nothing extra needed # default to true for C because it's a C++ library, nothing extra needed
variant("c", default=True, description="Build the C bindings.") variant("c", default=True, description="Build the C bindings.")
@ -93,9 +100,10 @@ def patch(self):
), ),
"src/python/CMakeLists.txt") "src/python/CMakeLists.txt")
# Fix the install location so that spack activate works # Fix the install location so that spack activate works
filter_file("share/flann/python", if '+python' in self.spec:
site_packages_dir, filter_file("share/flann/python",
"src/python/CMakeLists.txt") site_packages_dir,
"src/python/CMakeLists.txt")
# Hack. Don't install setup.py # Hack. Don't install setup.py
filter_file("install( FILES", filter_file("install( FILES",
"# install( FILES", "# install( FILES",