diff options
author | Magnus Lundborg <lundborg.magnus@gmail.com> | 2013-05-20 07:10:42 (GMT) |
---|---|---|
committer | Magnus Lundborg <lundborg.magnus@gmail.com> | 2013-05-20 07:10:42 (GMT) |
commit | 74c11f5f2026bb02385763fd96d41d1d6a5f989c (patch) | |
tree | 082aabc267ab563cf3feaff0af29bc8ded99ca2e /src/compression/CMakeLists.txt | |
parent | c673e2e56c9ab6b4d475467fb752c6fa83d9bc41 (diff) | |
parent | 0f36e7de86f181eed7e49eedb3d66a0c6ab6f8cd (diff) |
Merge branch 'master' of git.gromacs.org:tng
Merged conflicts.
Conflicts:
src/lib/tng_io.c
Diffstat (limited to 'src/compression/CMakeLists.txt')
-rw-r--r-- | src/compression/CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/compression/CMakeLists.txt b/src/compression/CMakeLists.txt index 35e01f7..605dac7 100644 --- a/src/compression/CMakeLists.txt +++ b/src/compression/CMakeLists.txt @@ -5,4 +5,6 @@ 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) -target_link_libraries(tng_compress m)
\ No newline at end of file +if(UNIX) +target_link_libraries(tng_compress m) +endif() |