From 718d755c5877bc3005ade2827e7c9cec1c6d064a Mon Sep 17 00:00:00 2001 From: Daniel Spangberg Date: Wed, 15 May 2013 14:35:29 +0200 Subject: Also add the modified cmakefiles. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 165c089..bab61c6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,2 +1,3 @@ add_subdirectory(lib) add_subdirectory(tests) +add_subdirectory(compression) diff --git a/src/compression/CMakeLists.txt b/src/compression/CMakeLists.txt index 3cd090b..bdc82b8 100644 --- a/src/compression/CMakeLists.txt +++ b/src/compression/CMakeLists.txt @@ -1,14 +1 @@ -add_library(tng_io SHARED tng_io.c md5.c) - -if(HAVE_INTTYPES_H) - set_property(TARGET tng_io APPEND PROPERTY COMPILE_DEFINITIONS USE_STD_INTTYPES_H) -endif() - -if(BUILD_FORTRAN) - set_property(TARGET tng_io APPEND PROPERTY COMPILE_DEFINITIONS BUILD_FORTRAN) -endif() - -if(ZLIB_FOUND) - set_property(TARGET tng_io APPEND PROPERTY COMPILE_DEFINITIONS USE_ZLIB) - target_link_libraries(tng_io ${ZLIB_LIBRARIES}) -endif() +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/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 4a63c54..094f5f5 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -1,3 +1,5 @@ +add_subdirectory(compression) + if(NOT OPENMP_FOUND) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") endif() -- cgit v0.10.1