Skip to content

Commit

Permalink
Switch to cmake full time
Browse files Browse the repository at this point in the history
  • Loading branch information
kpu committed Feb 22, 2016
1 parent fcb8d2c commit 9662a51
Show file tree
Hide file tree
Showing 262 changed files with 10 additions and 74,586 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,9 @@ windows/*.user
windows/*.sdf
windows/*.opensdf
windows/*.suo
Makefile
CTestTestfile.cmake
cmake_install.cmake
CMakeFiles
CMakeCache.txt
DartConfiguration.tcl
5 changes: 2 additions & 3 deletions BUILDING
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
If you have Boost >= 1.36.0 installed:
./bjam
./bjam install --prefix=/usr #optional
KenLM has switched to cmake
cmake .

If you only want the query code and do not care about compression (.gz, .bz2, and .xz):
./compile_query_only.sh
Expand Down
68 changes: 0 additions & 68 deletions Jamroot

This file was deleted.

3 changes: 1 addition & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@ details.
util/getopt.* is getopt for Windows
util/murmur_hash.cc
util/string_piece.hh and util/string_piece.cc
util/double-conversion/LICENSE covers util/double-conversion except Jamfile
util/double-conversion/LICENSE covers util/double-conversion except the build files
util/file.cc contains a modified implementation of mkstemp under the LGPL
util/integer_to_string.* is BSD
jam-files/LICENSE_1_0.txt covers jam-files except Jamroot

For the rest:

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ I do development in master on https://github.com/kpu/kenlm/. Normally, it works
The website http://kheafield.com/code/kenlm/ has more documentation. If you're a decoder developer, please download the latest version from there instead of copying from another decoder.

## Compiling
See BUILDING.
Use cmake, see [BUILDING](BUILDING) for more detail.

## Compiling with your own build system
If you want to compile with your own build system (Makefile etc) or to use as a library, there are a number of macros you can set on the g++ command line or in util/have.hh .
Expand Down
23 changes: 0 additions & 23 deletions bjam

This file was deleted.

23 changes: 0 additions & 23 deletions jam-files/LICENSE_1_0.txt

This file was deleted.

8 changes: 0 additions & 8 deletions jam-files/boost-build/boost-build.jam

This file was deleted.

18 changes: 0 additions & 18 deletions jam-files/boost-build/bootstrap.jam

This file was deleted.

Loading

0 comments on commit 9662a51

Please sign in to comment.