diff options
| author | Chris Dyer <redpony@gmail.com> | 2015-04-02 00:50:04 -0400 |
|---|---|---|
| committer | Chris Dyer <redpony@gmail.com> | 2015-04-02 00:50:04 -0400 |
| commit | 5ee02ce1602f2fce6d5af5db93c2278fe6c9ede5 (patch) | |
| tree | 7ebad8dd99e38d190c579f425c3eb959363e96e5 /klm/util/stream | |
| parent | e7d77de8a9b9929b22fc6562f88f3668900f9662 (diff) | |
| parent | 737ed7a7f932b1a7e40d2755bcdee6bc0aa2de63 (diff) | |
Merge pull request #70 from redpony/cmake
Cmake
Diffstat (limited to 'klm/util/stream')
| -rw-r--r-- | klm/util/stream/CMakeLists.txt | 20 | ||||
| -rw-r--r-- | klm/util/stream/Makefile.am | 21 |
2 files changed, 20 insertions, 21 deletions
diff --git a/klm/util/stream/CMakeLists.txt b/klm/util/stream/CMakeLists.txt new file mode 100644 index 00000000..3ca25f17 --- /dev/null +++ b/klm/util/stream/CMakeLists.txt @@ -0,0 +1,20 @@ +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../..) + +set(klm_util_stream_STAT_SRCS + block.hh + chain.cc + chain.hh + config.hh + io.cc + io.hh + line_input.cc + line_input.hh + multi_progress.cc + multi_progress.hh + multi_stream.hh + sort.hh + stream.hh + timer.hh) + +add_library(klm_util_stream STATIC ${klm_util_stream_STAT_SRCS}) + diff --git a/klm/util/stream/Makefile.am b/klm/util/stream/Makefile.am deleted file mode 100644 index 25817b50..00000000 --- a/klm/util/stream/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -noinst_LIBRARIES = libklm_util_stream.a - -libklm_util_stream_a_SOURCES = \ - block.hh \ - chain.cc \ - chain.hh \ - config.hh \ - io.cc \ - io.hh \ - line_input.cc \ - line_input.hh \ - multi_progress.cc \ - multi_progress.hh \ - multi_stream.hh \ - sort.hh \ - stream.hh \ - timer.hh - -AM_CPPFLAGS = -W -Wall -I$(top_srcdir)/klm - -#-I$(top_srcdir)/klm/util/double-conversion |