From 22705f7863f87e850b3ef6079b899787e5248b45 Mon Sep 17 00:00:00 2001
From: Magnus Lundborg <lundborg.magnus@gmail.com>
Date: Wed, 15 May 2013 16:39:52 +0200
Subject: Updated CMake files for compression library.

The include path was specified and the tng_io library linked to the
compression library.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bab61c6..d5f2bc0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,3 +1,3 @@
+add_subdirectory(compression)
 add_subdirectory(lib)
 add_subdirectory(tests)
-add_subdirectory(compression)
diff --git a/src/compression/CMakeLists.txt b/src/compression/CMakeLists.txt
index bdc82b8..e9e4bdc 100644
--- a/src/compression/CMakeLists.txt
+++ b/src/compression/CMakeLists.txt
@@ -1 +1,7 @@
+set(COMP_INC_DIR ${CMAKE_SOURCE_DIR}/include/compression)
+
+include_directories(${COMP_INC_DIR})
+
+set(HEADER_FILES ${COMP_INC_DIR}/bwlzh.h ${COMP_INC_DIR}/bwt.h ${COMP_INC_DIR}/coder.h ${COMP_INC_DIR}/dict.h ${COMP_INC_DIR}/fixpoint.h ${COMP_INC_DIR}/huffman.h ${COMP_INC_DIR}/lz77.h ${COMP_INC_DIR}/merge_sort.h ${COMP_INC_DIR}/mtf.h ${COMP_INC_DIR}/my64bit.h ${COMP_INC_DIR}/rle.h ${COMP_INC_DIR}/tng_compress.h ${COMP_INC_DIR}/vals16.h ${COMP_INC_DIR}/warnmalloc.h ${COMP_INC_DIR}/widemuldiv.h)
+
 add_library(tng_compress SHARED bwlzh.c bwt.c coder.c dict.c fixpoint.c huffman.c huffmem.c lz77.c merge_sort.c mtf.c rle.c tng_compress.c vals16.c warnmalloc.c widemuldiv.c xtc2.c xtc3.c)
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index 3cd090b..ef59ed5 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -10,5 +10,7 @@ endif()
 
 if(ZLIB_FOUND)
   set_property(TARGET tng_io APPEND PROPERTY COMPILE_DEFINITIONS USE_ZLIB)
-  target_link_libraries(tng_io ${ZLIB_LIBRARIES})
+  target_link_libraries(tng_io tng_compress ${ZLIB_LIBRARIES})
+else()
+  target_link_libraries(tng_io tng_compress)
 endif()
-- 
cgit v0.10.1