diff options
| author | Kenneth Heafield <github@kheafield.com> | 2012-09-11 14:49:58 +0100 |
|---|---|---|
| committer | Kenneth Heafield <github@kheafield.com> | 2012-09-11 14:49:58 +0100 |
| commit | 2ca3db90bd0a2e9a8619d2ebec7c6ac723838aca (patch) | |
| tree | a26a3ffc9ff2e893dba890889d42bcc0e5967227 | |
| parent | 58d7f847cd5b3c56682e834a2d9b897c6943fafc (diff) | |
Minor build fixes
| -rw-r--r-- | Jamroot | 4 | ||||
| -rw-r--r-- | klm/util/have.hh | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -26,7 +26,7 @@ if [ test_header boost/serialization/map.hpp ] && [ test_library boost_serializa requirements += <define>HAVE_BOOST_ARCHIVE_TEXT_OARCHIVE_HPP ; } -project : requirements $(requirements) <toolset>darwin:<link>static ; +project : requirements $(requirements) <toolset>darwin:<link>static <library>boost_system ; project : default-build <warnings>on <variant>release ; install-bin-libs dpmert//programs utils//programs mteval//programs klm/lm//programs training//liblbfgs decoder//cdec phrasinator//programs mira//kbest_mira ; @@ -40,6 +40,6 @@ rule all_tests ( targets * : dependencies : properties * ) { targets ?= [ glob *_test.cc ] ; for t in $(targets) { local base = [ MATCH "^(.*).cc$" : $(t) ] ; - unit-test $(base) : $(t) $(dependencies) ..//boost_unit_test_framework : $(properties) ; + unit-test $(base) : $(t) $(dependencies) /top//boost_unit_test_framework : $(properties) ; } } diff --git a/klm/util/have.hh b/klm/util/have.hh index 1d76a7fc..b8181e99 100644 --- a/klm/util/have.hh +++ b/klm/util/have.hh @@ -13,7 +13,7 @@ #endif #ifndef HAVE_BOOST -//#define HAVE_BOOST +#define HAVE_BOOST #endif #ifndef HAVE_THREADS |