From aed2119e5ca918e1f493d65a2e6dbd20487eef0a Mon Sep 17 00:00:00 2001 From: Jim Galarowicz Date: Tue, 18 Jul 2017 20:15:52 -0500 Subject: [PATCH] Add more changes for PR 4765. --- var/spack/repos/builtin/packages/cbtf-argonavis/package.py | 6 ------ var/spack/repos/builtin/packages/cbtf/package.py | 6 ------ 2 files changed, 12 deletions(-) diff --git a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py index 7f5cf6e7772..4284ef2ed4f 100644 --- a/var/spack/repos/builtin/packages/cbtf-argonavis/package.py +++ b/var/spack/repos/builtin/packages/cbtf-argonavis/package.py @@ -71,13 +71,7 @@ def build_type(self): def cmake_args(self): 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 = [ - '-DCMAKE_PREFIX_PATH=%s' % cmake_prefix_path, '-DCUDA_DIR=%s' % spec['cuda'].prefix, '-DCUDA_INSTALL_PATH=%s' % spec['cuda'].prefix, '-DCUDA_TOOLKIT_ROOT_DIR=%s' % spec['cuda'].prefix, diff --git a/var/spack/repos/builtin/packages/cbtf/package.py b/var/spack/repos/builtin/packages/cbtf/package.py index 8ef55404101..5500c5d1386 100644 --- a/var/spack/repos/builtin/packages/cbtf/package.py +++ b/var/spack/repos/builtin/packages/cbtf/package.py @@ -94,9 +94,6 @@ def cmake_args(self): '-DCMAKE_MODULE_PATH=%s' % join_path( 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 # type, etc to be self.adjustBuildTypeParams_cmakeOptions(spec, cmake_args) @@ -110,9 +107,6 @@ def cmake_args(self): '-DCMAKE_MODULE_PATH=%s' % join_path( 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 # type, etc to be self.adjustBuildTypeParams_cmakeOptions(spec, cmake_args)