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

fiddle more

Browse Source
This commit is contained in:
Denis Davydov 2016-03-23 17:38:36 +01:00
parent fade526ae4
commit e51fe2934e
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,7 +67,6 @@ def install(self, spec, prefix):
'-DTPL_ENABLE_Boost:BOOL=ON', '-DTPL_ENABLE_Boost:BOOL=ON',
'-DBoost_INCLUDE_DIRS:PATH=%s' % spec['boost'].prefix.include, '-DBoost_INCLUDE_DIRS:PATH=%s' % spec['boost'].prefix.include,
'-DBoost_LIBRARY_DIRS:PATH=%s' % spec['boost'].prefix.lib, '-DBoost_LIBRARY_DIRS:PATH=%s' % spec['boost'].prefix.lib,
# '-DTrilinos_ENABLE_Fortran=OFF', # FIXME
'-DTrilinos_ENABLE_EXPLICIT_INSTANTIATION:BOOL=ON', '-DTrilinos_ENABLE_EXPLICIT_INSTANTIATION:BOOL=ON',
'-DTrilinos_ENABLE_CXX11:BOOL=ON', '-DTrilinos_ENABLE_CXX11:BOOL=ON',
'-DTrilinos_CXX11_FLAGS=-std=c++11', '-DTrilinos_CXX11_FLAGS=-std=c++11',
@ -82,10 +81,9 @@ def install(self, spec, prefix):
# Fortran lib # Fortran lib
libgfortran = os.path.dirname (os.popen('%s --print-file-name libgfortran.a' % join_path(mpi_bin,'mpif90') ).read()) libgfortran = os.path.dirname (os.popen('%s --print-file-name libgfortran.a' % join_path(mpi_bin,'mpif90') ).read())
#os.environ['LDFLAGS'] = '-L%s -lgfortran' % libgfortran
options.extend([ options.extend([
'-DTrilinos_EXTRA_LINK_FLAGS:STRING=-lgfortran', '-DTrilinos_EXTRA_LINK_FLAGS:STRING=-L%s/ -lgfortran' % libgfortran,
'-DCMAKE_EXE_LINKER_FLAGS:STRING=-L%s -lgfortran' % libgfortran '-DTrilinos_ENABLE_Fortran=OFF' # FIXME: otherwise VerifyFortranC fails as it does not contain -lgfortran , issues with IMPLICIT_LINK_LIBRARIES in CMakeFiles/CMake(C|CXX|Fortran)Compiler.cmake?
]) ])
# for build-debug only: # for build-debug only:
@ -155,11 +153,6 @@ def install(self, spec, prefix):
'-DTrilinos_ENABLE_STK=OFF' '-DTrilinos_ENABLE_STK=OFF'
]) ])
#if self.compiler.name == "clang":
# options.extend([
# '-DCMAKE_EXE_LINKER_FLAGS:STRING=-Qunused-arguments'
# ])
with working_dir('spack-build', create=True): with working_dir('spack-build', create=True):
cmake('..', *options) cmake('..', *options)
make() make()