Ticket #46: scons_addons_boost.diff

File scons_addons_boost.diff, 1.5 kB (added by cneumann, 2 years ago)

  • Tools/scons-addons/src/SConsAddons/Options/Boost.py

    old new  
    4949      """ 
    5050      help_text = ["Base directory for Boost. include, and lib should be under this directory.", 
    5151                   "Include directory for boost (if not under base)."] 
    52       self.baseDirKey = "BoostBaseDir" 
    53       self.incDirKey = "BoostIncludeDir" 
     52      self.baseDirKey = "boost" 
     53      self.incDirKey = "boost_incdir" 
    5454      self.requiredVersion = requiredVersion 
    5555      self.libVersionStr = None 
    5656      self.lib_names = libs 
    …… 
    214214            print "   found at: ", self.baseDir 
    215215 
    216216   def validate(self, env): 
    217       " Check to make sure that the current settings work and are valid. """ 
     217      """ Check to make sure that the current settings work and are valid. 
     218      """ 
    218219      # Check that path exist 
    219220      # Check that an include file: boost/version.hpp  exists 
    220221      passed = True 
    …… 
    449450    
    450451   def dumpSettings(self,env=None): 
    451452      "Write out the settings" 
    452       print "BoostBaseDir:", self.baseDir 
    453       print "BoostIncludeDir:", self.incDir 
     453      print "boost:", self.baseDir 
     454      print "boost_incdir:", self.incDir 
    454455      print "CPPPATH (as flags):", self.found_incs_as_flags 
    455456      print "CPPDEFINES:", self.found_defines 
    456457      print "LIBS:", self.lib_names