[SCons] Remove unnecessary code block

This commit is contained in:
Ray Speth 2023-06-22 22:41:12 -04:00 committed by Ingmar Schoegl
parent 436ad647d7
commit 730885b6ed

View File

@ -20,30 +20,29 @@ install('$inst_libdir', lib)
install('$inst_incdir', mods) install('$inst_incdir', mods)
# Build the Cantera Fortran interface shared library # Build the Cantera Fortran interface shared library
if localenv['layout'] != 'debian': if localenv['renamed_shared_libraries']:
if localenv['renamed_shared_libraries']: sharedName = '../../lib/cantera_fortran_shared'
sharedName = '../../lib/cantera_fortran_shared' else:
else: sharedName = '../../lib/cantera_fortran'
sharedName = '../../lib/cantera_fortran'
if localenv['versioned_shared_library']: if localenv['versioned_shared_library']:
shlib = build(localenv.SharedLibrary(target=sharedName, source=objects, shlib = build(localenv.SharedLibrary(target=sharedName, source=objects,
SPAWN=get_spawn(localenv), SPAWN=get_spawn(localenv),
SHLIBVERSION=localenv['cantera_pure_version'], SHLIBVERSION=localenv['cantera_pure_version'],
LIBS=list(env['cantera_shared_libs'] + env['cxx_stdlib']), LIBS=list(env['cantera_shared_libs'] + env['cxx_stdlib']),
LINK='$FORTRAN_LINK')) LINK='$FORTRAN_LINK'))
install(localenv.InstallVersionedLib, '$inst_shlibdir', shlib) install(localenv.InstallVersionedLib, '$inst_shlibdir', shlib)
else: else:
shlib = build(localenv.SharedLibrary(target=sharedName, source=objects, shlib = build(localenv.SharedLibrary(target=sharedName, source=objects,
SPAWN=get_spawn(localenv), SPAWN=get_spawn(localenv),
LIBS=list(env['cantera_shared_libs'] + env['cxx_stdlib']), LIBS=list(env['cantera_shared_libs'] + env['cxx_stdlib']),
LINK='$FORTRAN_LINK')) LINK='$FORTRAN_LINK'))
for libfile in shlib: for libfile in shlib:
if libfile.name.endswith(('.exp', '.lib')): if libfile.name.endswith(('.exp', '.lib')):
# On Windows, these are the export/import libraries used when linking, which # On Windows, these are the export/import libraries used when linking, which
# should be installed in the same location as static libraries # should be installed in the same location as static libraries
install('$inst_libdir', libfile) install('$inst_libdir', libfile)
else: else:
install('$inst_shlibdir', libfile) install('$inst_shlibdir', libfile)
localenv.Depends(shlib, localenv['config_h_target']) localenv.Depends(shlib, localenv['config_h_target'])