Adding Nalu package. (#4428)
* Adding Nalu package. * Fixing flake8 stuff. * Fixing flake8 stuff. * Reorganizing trilinos package file a little to make it less verbose. * Reorganizing trilinos package file for more general use as well as use as a dependency of the Nalu package. Setting fpic as default for yaml-cpp and superlu. * Explicitly stating fpic variants in dependent packages. * Updating nalu and trilinos package files with suggested changes. * Fixing formatting issues. Making suggested changes. * Fixing formatting. * Reducing amount of explicit variants in Nalu. Adding suggested changes to Trilinos package file. * Making suggested changes to Nalu package. * Turning off superlu-dist variant. * Cleaning up yaml-cpp file. * Fixing pnetcdf requirements in trilinos.
This commit is contained in:

committed by
Adam J. Stewart

parent
816f4f8b04
commit
3508909f06
@@ -36,7 +36,7 @@ class YamlCpp(CMakePackage):
|
||||
|
||||
variant('shared', default=True,
|
||||
description='Enable build of shared libraries')
|
||||
variant('fpic', default=False,
|
||||
variant('fpic', default=True,
|
||||
description='Build with position independent code')
|
||||
|
||||
depends_on('boost', when='@:0.5.3')
|
||||
@@ -45,13 +45,11 @@ def cmake_args(self):
|
||||
spec = self.spec
|
||||
options = []
|
||||
|
||||
if '+fpic' in spec:
|
||||
options.extend([
|
||||
'-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=true'
|
||||
])
|
||||
if '+shared' in spec:
|
||||
options.append('-DBUILD_SHARED_LIBS=ON')
|
||||
else:
|
||||
options.append('-DBUILD_SHARED_LIBS=OFF')
|
||||
options.extend([
|
||||
'-DBUILD_SHARED_LIBS:BOOL=%s' % (
|
||||
'ON' if '+shared' in spec else 'OFF'),
|
||||
'-DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=%s' % (
|
||||
'ON' if '+fpic' in spec else 'OFF'),
|
||||
])
|
||||
|
||||
return options
|
||||
|
Reference in New Issue
Block a user