summaryrefslogtreecommitdiff
path: root/klm/util/stream
diff options
context:
space:
mode:
authorChris Dyer <redpony@gmail.com>2015-03-03 01:14:07 -0500
committerChris Dyer <redpony@gmail.com>2015-03-03 01:14:07 -0500
commit6cbdccb1d9a62b2723b962ba4b6e66f1631e48d3 (patch)
tree686d2e294f8a69cad620fced60106fcb1f6cac8e /klm/util/stream
parent24cee877f2bb4b490495ea578564d0266b1addd3 (diff)
migration to cmake
Diffstat (limited to 'klm/util/stream')
-rw-r--r--klm/util/stream/CMakeLists.txt20
-rw-r--r--klm/util/stream/Makefile.am21
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