Skip to content

Commit 9662a51

Browse files
committed
Switch to cmake full time
1 parent fcb8d2c commit 9662a51

File tree

262 files changed

+10
-74586
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

262 files changed

+10
-74586
lines changed

Diff for: .gitignore

+6
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,9 @@ windows/*.user
3131
windows/*.sdf
3232
windows/*.opensdf
3333
windows/*.suo
34+
Makefile
35+
CTestTestfile.cmake
36+
cmake_install.cmake
37+
CMakeFiles
38+
CMakeCache.txt
39+
DartConfiguration.tcl

Diff for: BUILDING

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
If you have Boost >= 1.36.0 installed:
2-
./bjam
3-
./bjam install --prefix=/usr #optional
1+
KenLM has switched to cmake
2+
cmake .
43

54
If you only want the query code and do not care about compression (.gz, .bz2, and .xz):
65
./compile_query_only.sh

Diff for: Jamroot

-68
This file was deleted.

Diff for: LICENSE

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@ details.
55
util/getopt.* is getopt for Windows
66
util/murmur_hash.cc
77
util/string_piece.hh and util/string_piece.cc
8-
util/double-conversion/LICENSE covers util/double-conversion except Jamfile
8+
util/double-conversion/LICENSE covers util/double-conversion except the build files
99
util/file.cc contains a modified implementation of mkstemp under the LGPL
1010
util/integer_to_string.* is BSD
11-
jam-files/LICENSE_1_0.txt covers jam-files except Jamroot
1211

1312
For the rest:
1413

Diff for: README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ I do development in master on https://github.com/kpu/kenlm/. Normally, it works
77
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.
88

99
## Compiling
10-
See BUILDING.
10+
Use cmake, see [BUILDING](BUILDING) for more detail.
1111

1212
## Compiling with your own build system
1313
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 .

Diff for: bjam

-23
This file was deleted.

Diff for: jam-files/LICENSE_1_0.txt

-23
This file was deleted.

Diff for: jam-files/boost-build/boost-build.jam

-8
This file was deleted.

Diff for: jam-files/boost-build/bootstrap.jam

-18
This file was deleted.

0 commit comments

Comments
 (0)