From f0ee7804957480e6b63e21b520e690c237a21f75 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Sat, 1 Jul 2023 15:15:32 -0400 Subject: [PATCH] [SCons] Use options for dynamic linking in generated cantera.pc Fixes #1422 --- platform/posix/SConscript | 17 ++++++----------- platform/posix/cantera.pc.in | 2 +- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/platform/posix/SConscript b/platform/posix/SConscript index c3babf3ad17..0b6dcdcf0a7 100644 --- a/platform/posix/SConscript +++ b/platform/posix/SConscript @@ -13,7 +13,7 @@ if env['INSTALL_MANPAGES']: # cantera.pc for use with pkg-config -pc_libs = list(localenv['cantera_libs']) +pc_libs = list(localenv['cantera_shared_libs']) pc_libdirs = [] pc_incdirs = [] pc_cflags = list(localenv['CXXFLAGS']) @@ -22,19 +22,14 @@ if not localenv["package_build"]: pc_incdirs.extend(localenv["extra_inc_dirs"]) pc_libdirs.extend(localenv["extra_lib_dirs"]) -if localenv['system_sundials']: - # Add links to the sundials environment - if localenv["sundials_libdir"] and not localenv["package_build"]: - pc_libdirs.append(localenv['sundials_libdir']) - - if localenv["sundials_include"] and not localenv["package_build"]: + if localenv['system_sundials'] and localenv["sundials_include"]: pc_incdirs.append(localenv['sundials_include']) -if localenv["boost_inc_dir"] and not localenv["package_build"]: - pc_incdirs.append(localenv['boost_inc_dir']) + if localenv["boost_inc_dir"]: + pc_incdirs.append(localenv['boost_inc_dir']) -if localenv["use_hdf5"] and not localenv["package_build"]: - pc_incdirs.append(localenv["hdf_include"]) + if localenv["use_hdf5"]: + pc_incdirs.append(localenv["hdf_include"]) if 'Accelerate' in localenv['FRAMEWORKS']: pc_cflags.append('-framework Accelerate') diff --git a/platform/posix/cantera.pc.in b/platform/posix/cantera.pc.in index 29cfed08611..8d6c202e097 100644 --- a/platform/posix/cantera.pc.in +++ b/platform/posix/cantera.pc.in @@ -8,5 +8,5 @@ Description: Cantera library URL: https://cantera.org Version: @cantera_version@ -Libs: -L${libdir} @pc_libdirs@ @pc_libs@ +Libs: -L${libdir} -Wl,-rpath,${libdir} @pc_libdirs@ @pc_libs@ Cflags: @pc_cflags@ -I${includedir} @pc_incdirs@