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

trilinos / oce : add missing if before calling macOS_version (#5743)

Browse Source 
* trilinos: add missing if before calling macOS_version

* oce: add missing if before calling macOS_version
This commit is contained in:
Denis Davydov 2017-10-13 15:49:18 +02:00 committed by Christoph Junghans
parent 9716a6f37f
commit b8c1ce43fa
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
var/spack/repos/builtin/packages/oce/package.py
View File

@ -92,7 +92,8 @@ def install(self, spec, prefix):
'-DOCE_OSX_USE_COCOA:BOOL=ON', '-DOCE_OSX_USE_COCOA:BOOL=ON',
]) ])
if macOS_version() >= Version('10.12'): if platform.system() == 'Darwin' and (
macOS_version() >= Version('10.12')):
# use @rpath on Sierra due to limit of dynamic loader # use @rpath on Sierra due to limit of dynamic loader
options.append('-DCMAKE_MACOSX_RPATH=ON') options.append('-DCMAKE_MACOSX_RPATH=ON')
else: else:

2
var/spack/repos/builtin/packages/trilinos/package.py
View File

@ -586,7 +586,7 @@ def cmake_args(self):
'-DTrilinos_ENABLE_FEI=OFF' '-DTrilinos_ENABLE_FEI=OFF'
]) ])
if macOS_version() >= Version('10.12'): if sys.platform == 'darwin' and macOS_version() >= Version('10.12'):
# use @rpath on Sierra due to limit of dynamic loader # use @rpath on Sierra due to limit of dynamic loader
options.append('-DCMAKE_MACOSX_RPATH=ON') options.append('-DCMAKE_MACOSX_RPATH=ON')
else: else: