summaryrefslogtreecommitdiff
path: root/Jamroot
diff options
context:
space:
mode:
authorPatrick Simianer <simianer@cl.uni-heidelberg.de>2012-05-18 13:16:03 +0200
committerPatrick Simianer <simianer@cl.uni-heidelberg.de>2012-05-18 13:16:03 +0200
commit22d2f3ce5bd3fae2db9744eb66f7b8c3996265d6 (patch)
tree5cebab1bd3a0e77b108a19a786fe541cd7ce546c /Jamroot
parent78a0ee61c2d2d846306b60a8ac862a2d649bcf59 (diff)
parenta70d6d3ed83a32d3cdf4bcb36a087426a4ed2c31 (diff)
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'Jamroot')
-rw-r--r--Jamroot11
1 files changed, 8 insertions, 3 deletions
diff --git a/Jamroot b/Jamroot
index f873db68..fff11d56 100644
--- a/Jamroot
+++ b/Jamroot
@@ -18,16 +18,21 @@ if [ test_header google/dense_hash_map ] || $(with-google-hash) {
requirements += <define>HAVE_SPARSEHASH <include>$(with-google-hash) ;
}
+if [ test_header cmph.h ] || $(with-cmph) {
+ requirements += <define>HAVE_CMPH <include>$(with-cmph) ;
+}
+
if [ test_header boost/serialization/map.hpp ] && [ test_library boost_serialization ] {
requirements += <define>HAVE_BOOST_ARCHIVE_TEXT_OARCHIVE_HPP ;
}
-project : requirements $(requirements) ;
+# project : requirements $(requirements) ;
+project : requirements $(requirements) <toolset>darwin:<link>static ;
project : default-build <threading>single <warnings>on <variant>release ;
-install-bin-libs utils//programs mteval//programs klm/lm//programs decoder//cdec phrasinator//programs ;
+install-bin-libs utils//programs mteval//programs klm/lm//programs training//liblbfgs decoder//cdec creg//creg phrasinator//programs ;
-build-projects mteval decoder klm/lm ;
+build-projects mteval decoder klm/lm training/liblbfgs creg ;
#Compile everything ending with _test.cc into a test and run it.
rule all_tests ( targets * : dependencies : properties * ) {