From 029e2c5d2ec4b75bf6206a57094e027543b4b373 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Wed, 26 Jun 2013 00:23:14 +0000 Subject: [PATCH] [SCons] single_library defaults to True Also, using single_library=n is deprecated. --- SConstruct | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/SConstruct b/SConstruct index 1d6059a15..6ead69568 100644 --- a/SConstruct +++ b/SConstruct @@ -246,10 +246,8 @@ else: if env['OS'] in ('Windows', 'Darwin'): defaults.threadFlags = '' - defaults.singleLibrary = True else: defaults.threadFlags = '-pthread' - defaults.singleLibrary = False defaults.fsLayout = 'compact' if env['OS'] == 'Windows' else 'standard' defaults.env_vars = 'LD_LIBRARY_PATH' if 'LD_LIBRARY_PATH' in os.environ else '' @@ -574,9 +572,11 @@ config_options = [ False), BoolVariable( 'single_library', - """If set, include code from the 'ext' folder in the cantera library - rather than creating separate libraries for ctlapack, ctf2c, etc.""", - defaults.singleLibrary), + """If set to 'n', code from the 'ext' folder in the cantera library + will be placed in separate libraries for ctlapack, ctf2c, etc., rather + than being included in the cantera library. NOTE: This option is + deprecated, and will be removed in Cantera 2.2.""", + True), EnumVariable( 'layout', """The layout of the directory structure. 'standard' installs files to