wscript
changeset 13891 cce751c7e678
parent 13818 8189257d4f62
equal deleted inserted replaced
13890:b6be8762cc18 13891:cce751c7e678
   455     if conf.check_compilation_flag(Options.options.cxx_standard):
   455     if conf.check_compilation_flag(Options.options.cxx_standard):
   456         env.append_value('CXXFLAGS', Options.options.cxx_standard)
   456         env.append_value('CXXFLAGS', Options.options.cxx_standard)
   457     else:
   457     else:
   458         Logs.warn("CXX Standard flag " + Options.options.cxx_standard + " was not recognized, using compiler's default")
   458         Logs.warn("CXX Standard flag " + Options.options.cxx_standard + " was not recognized, using compiler's default")
   459 
   459 
       
   460     # Find Boost libraries by modules
       
   461     conf.env['REQUIRED_BOOST_LIBS'] = []
       
   462     for modules_dir in ['src', 'contrib']:
       
   463         conf.recurse (modules_dir, name="get_required_boost_libs", mandatory=False)
       
   464 
       
   465     if conf.env['REQUIRED_BOOST_LIBS'] is not []:
       
   466         conf.load('boost')
       
   467         conf.check_boost(lib=' '.join (conf.env['REQUIRED_BOOST_LIBS']), mandatory=False)
       
   468         if not conf.env['LIB_BOOST']:
       
   469             conf.check_boost(lib=' '.join (conf.env['REQUIRED_BOOST_LIBS']), libpath="/usr/lib64", mandatory=False)
       
   470             if not conf.env['LIB_BOOST']:
       
   471                 conf.env['LIB_BOOST'] = []
       
   472 
   460     # Set this so that the lists won't be printed at the end of this
   473     # Set this so that the lists won't be printed at the end of this
   461     # configure command.
   474     # configure command.
   462     conf.env['PRINT_BUILT_MODULES_AT_END'] = False
   475     conf.env['PRINT_BUILT_MODULES_AT_END'] = False
   463 
   476 
   464     conf.env['MODULES_NOT_BUILT'] = []
   477     conf.env['MODULES_NOT_BUILT'] = []