summaryrefslogtreecommitdiff
path: root/src/compression
diff options
context:
space:
mode:
authorMark Abraham <mark.j.abraham@gmail.com>2014-06-16 09:53:30 (GMT)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>2014-06-16 13:52:30 (GMT)
commit4019fd9081241aca8a054252fcb5654297888a38 (patch)
tree5d8d7957755e019ea262d2d36ca9b175d9ac803c /src/compression
parentf38717324267c2da69c20a0f1918ce8ef1e66be7 (diff)
Enhancements to CMake usage
These changes mostly address being able to use fully-constructed source-file targets in GROMACS, e.g. to construct an object library. Thus compilation properties are moved onto the source files, rather than the library into which they are linked. Removed unnecessary library properties Made it easier to handle lists of source files in non-repetitious ways. Change-Id: I01a4a56ba8a8d45ba02d95d08c948b9ca5015013
Diffstat (limited to 'src/compression')
-rw-r--r--src/compression/CMakeLists.txt11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/compression/CMakeLists.txt b/src/compression/CMakeLists.txt
index 267a45a..3efd6bb 100644
--- a/src/compression/CMakeLists.txt
+++ b/src/compression/CMakeLists.txt
@@ -1,11 +1,12 @@
-add_library(tng_compress 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)
+set(source_files 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)
+
+add_library(tng_compress ${source_files})
+
+# Append the required library dependencies
if(UNIX)
-target_link_libraries(tng_compress m)
+ target_link_libraries(tng_compress m)
endif()
-set_property(TARGET tng_compress PROPERTY LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
-set_property(TARGET tng_compress PROPERTY ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
-
install(TARGETS tng_compress
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
contact: Jan Huwald // Impressum