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

Add more refinements to the conversion from Package to CMakePackage.

Browse Source
This commit is contained in:
Jim Galarowicz 2017-07-19 08:10:46 -05:00
parent aed2119e5c
commit 6646fe1b74
2 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
var/spack/repos/builtin/packages/cbtf-lanl/package.py
View File

@ -79,7 +79,6 @@ def cmake_args(self):
'-DCBTF_KRELL_DIR=%s' % spec['cbtf-krell'].prefix, '-DCBTF_KRELL_DIR=%s' % spec['cbtf-krell'].prefix,
'-DMRNET_DIR=%s' % spec['mrnet'].prefix, '-DMRNET_DIR=%s' % spec['mrnet'].prefix,
'-DXERCESC_DIR=%s' % spec['xerces-c'].prefix, '-DXERCESC_DIR=%s' % spec['xerces-c'].prefix,
'-DCMAKE_PREFIX_PATH=%s' % cmake_prefix_path,
'-DCMAKE_MODULE_PATH=%s' % join_path( '-DCMAKE_MODULE_PATH=%s' % join_path(
prefix.share, 'KrellInstitute', 'cmake')] prefix.share, 'KrellInstitute', 'cmake')]

24
var/spack/repos/builtin/packages/openspeedshop/package.py
View File

@ -77,8 +77,8 @@ class Openspeedshop(CMakePackage):
to point to target build.") to point to target build.")
variant('cuda', default=False, variant('cuda', default=False,
description="build with cuda packages included.") description="build with cuda packages included.")
variant('noqt3gui', default=False, variant('useqt4gui', default=False,
description="build without the build Qt3 gui package enabled.") description="build with Qt4/Qt5 based gui package enabled. Do not build older Qt3 gui")
variant('rtfe', default=False, variant('rtfe', default=False,
description="build for clusters heterogeneous processors \ description="build for clusters heterogeneous processors \
on fe/be nodes.") on fe/be nodes.")
@ -115,7 +115,7 @@ class Openspeedshop(CMakePackage):
depends_on("boost@1.50.0:1.59.0") depends_on("boost@1.50.0:1.59.0")
depends_on("dyninst@9.3.2") depends_on("dyninst@9.3.2")
depends_on("libxml2+python") depends_on("libxml2+python")
depends_on("qt@3.3.8b+krellpatch", when='~noqt3gui') depends_on("qt@3.3.8b+krellpatch", when='~useqt4gui')
# Dependencies only for the openspeedshop offline package. # Dependencies only for the openspeedshop offline package.
depends_on("libunwind", when='+offline') depends_on("libunwind", when='+offline')
@ -169,9 +169,7 @@ def cmake_args(self):
self.set_defaultbase_cmakeOptions(spec, cmake_args) self.set_defaultbase_cmakeOptions(spec, cmake_args)
cmake_args.extend( cmake_args.extend(
['-DCMAKE_PREFIX_PATH=%s' ['-DINSTRUMENTOR=%s'
% cmake_prefix_path,
'-DINSTRUMENTOR=%s'
% instrumentor_setting, % instrumentor_setting,
'-DLIBMONITOR_DIR=%s' '-DLIBMONITOR_DIR=%s'
% spec['libmonitor'].prefix, % spec['libmonitor'].prefix,
@ -203,9 +201,7 @@ def cmake_args(self):
self.set_defaultbase_cmakeOptions(spec, cmake_args) self.set_defaultbase_cmakeOptions(spec, cmake_args)
cmake_args.extend( cmake_args.extend(
['-DCMAKE_PREFIX_PATH=%s' ['-DINSTRUMENTOR=%s'
% cmake_prefix_path,
'-DINSTRUMENTOR=%s'
% instrumentor_setting, % instrumentor_setting,
'-DCBTF_DIR=%s' '-DCBTF_DIR=%s'
% spec['cbtf'].prefix, % spec['cbtf'].prefix,
@ -224,11 +220,9 @@ def cmake_args(self):
# Appends base options to cmake_args # Appends base options to cmake_args
self.set_defaultbase_cmakeOptions(spec, cmake_args) self.set_defaultbase_cmakeOptions(spec, cmake_args)
if '+noqt3gui' in self.spec: if '+useqt4gui' in self.spec:
cmake_args.extend( cmake_args.extend(
['-DCMAKE_PREFIX_PATH=%s' ['-DINSTRUMENTOR=%s'
% cmake_prefix_path,
'-DINSTRUMENTOR=%s'
% instrumentor_setting, % instrumentor_setting,
'-DSQLITE3_DIR=%s' '-DSQLITE3_DIR=%s'
% spec['sqlite'].prefix, % spec['sqlite'].prefix,
@ -240,9 +234,7 @@ def cmake_args(self):
% spec['mrnet'].prefix]) % spec['mrnet'].prefix])
else: else:
cmake_args.extend( cmake_args.extend(
['-DCMAKE_PREFIX_PATH=%s' ['-DINSTRUMENTOR=%s'
% cmake_prefix_path,
'-DINSTRUMENTOR=%s'
% instrumentor_setting, % instrumentor_setting,
'-DSQLITE3_DIR=%s' '-DSQLITE3_DIR=%s'
% spec['sqlite'].prefix, % spec['sqlite'].prefix,