diff options
| author | Kenneth Heafield <github@kheafield.com> | 2013-01-18 19:58:54 +0400 |
|---|---|---|
| committer | Kenneth Heafield <github@kheafield.com> | 2013-01-18 19:59:51 +0400 |
| commit | fc5868d0fff647c3879668af4bfe6e1bab9e83ab (patch) | |
| tree | d9b5026f32cc5ae603e6f42b1fc7128aeee4ba55 /jam-files/sanity.jam | |
| parent | 5f7b91e702f809577d82a7570778d254d985ba93 (diff) | |
KenLM df5be22 lmplz for estimation
Diffstat (limited to 'jam-files/sanity.jam')
| -rw-r--r-- | jam-files/sanity.jam | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/jam-files/sanity.jam b/jam-files/sanity.jam index a35042f79..530ecc420 100644 --- a/jam-files/sanity.jam +++ b/jam-files/sanity.jam @@ -138,9 +138,9 @@ rule boost ( min-version ) { echo Failed to run "$(cmd)" ; exit Boost does not seem to be installed or g++ is confused. : 1 ; } - boost-version = [ MATCH "#define BOOST_VERSION ([0-9]*)" : $(boost-shell[1]) ] ; - if $(boost-version) < $(min-version) && $(CLEANING) = no { - exit You have Boost $(boost-version). This package requires Boost at least $(min-version) (and preferably newer). : 1 ; + constant BOOST-VERSION : [ MATCH "#define BOOST_VERSION ([0-9]*)" : $(boost-shell[1]) ] ; + if $(BOOST-VERSION) < $(min-version) && $(CLEANING) = no { + exit You have Boost $(BOOST-VERSION). This package requires Boost at least $(min-version) (and preferably newer). : 1 ; } # If matching version tags exist, use them. boost-lib-version = [ MATCH "#define BOOST_LIB_VERSION \"([^\"]*)\"" : $(boost-shell[1]) ] ; @@ -159,6 +159,11 @@ rule boost ( min-version ) { boost-lib program_options PROGRAM_OPTIONS_DYN_LINK ; boost-lib unit_test_framework TEST_DYN_LINK ; boost-lib iostreams IOSTREAMS_DYN_LINK ; + boost-lib filesystem FILE_SYSTEM_DYN_LINK ; + if $(BOOST-VERSION) >= 104800 { + boost-lib chrono CHRONO_DYN_LINK ; + boost-lib timer TIMER_DYN_LINK : boost_chrono ; + } } #Link normally to a library, but sometimes static isn't installed so fall back to dynamic. |