zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add more changes for PR 4765.

Browse Source
This commit is contained in:
Jim Galarowicz 2017-07-18 20:15:52 -05:00
parent 65802c59fa
commit aed2119e5c
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
var/spack/repos/builtin/packages/cbtf-argonavis/package.py
View File

@ -71,13 +71,7 @@ def build_type(self):
def cmake_args(self): def cmake_args(self):
spec = self.spec spec = self.spec
# Look for package installation information in the cbtf and cbtf-krell
# prefixes
cmake_prefix_path = join_path(
spec['cbtf'].prefix) + ':' + join_path(spec['cbtf-krell'].prefix)
cmake_args = [ cmake_args = [
'-DCMAKE_PREFIX_PATH=%s' % cmake_prefix_path,
'-DCUDA_DIR=%s' % spec['cuda'].prefix, '-DCUDA_DIR=%s' % spec['cuda'].prefix,
'-DCUDA_INSTALL_PATH=%s' % spec['cuda'].prefix, '-DCUDA_INSTALL_PATH=%s' % spec['cuda'].prefix,
'-DCUDA_TOOLKIT_ROOT_DIR=%s' % spec['cuda'].prefix, '-DCUDA_TOOLKIT_ROOT_DIR=%s' % spec['cuda'].prefix,

6
var/spack/repos/builtin/packages/cbtf/package.py
View File

@ -94,9 +94,6 @@ def cmake_args(self):
'-DCMAKE_MODULE_PATH=%s' % join_path( '-DCMAKE_MODULE_PATH=%s' % join_path(
prefix.share, 'KrellInstitute', 'cmake')] prefix.share, 'KrellInstitute', 'cmake')]
# Add in the standard cmake arguments
cmake_args.extend(std_cmake_args)
# Adjust the standard cmake arguments to what we want the build # Adjust the standard cmake arguments to what we want the build
# type, etc to be # type, etc to be
self.adjustBuildTypeParams_cmakeOptions(spec, cmake_args) self.adjustBuildTypeParams_cmakeOptions(spec, cmake_args)
@ -110,9 +107,6 @@ def cmake_args(self):
'-DCMAKE_MODULE_PATH=%s' % join_path( '-DCMAKE_MODULE_PATH=%s' % join_path(
prefix.share, 'KrellInstitute', 'cmake')] prefix.share, 'KrellInstitute', 'cmake')]
# Add in the standard cmake arguments
cmake_args.extend(std_cmake_args)
# Adjust the standard cmake arguments to what we want the build # Adjust the standard cmake arguments to what we want the build
# type, etc to be # type, etc to be
self.adjustBuildTypeParams_cmakeOptions(spec, cmake_args) self.adjustBuildTypeParams_cmakeOptions(spec, cmake_args)