diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2014-09-27 00:41:06 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2014-09-27 00:41:06 +0000 |
| commit | 318c3619dcc19088cc48dccd8d21f87caeff3bb8 (patch) | |
| tree | 9533562994364df196b3e162285f8ab42626c3d3 /zlib | |
| parent | 8ef6520fe3dcae4372b816a49b11024736a0217d (diff) | |
CMake enhancements, as discussed in STR #3055.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10342 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'zlib')
| -rw-r--r-- | zlib/CMakeLists.txt | 32 |
1 files changed, 10 insertions, 22 deletions
diff --git a/zlib/CMakeLists.txt b/zlib/CMakeLists.txt index d12e46055..e96080622 100644 --- a/zlib/CMakeLists.txt +++ b/zlib/CMakeLists.txt @@ -1,32 +1,20 @@ -project(FLTKZLIB) -include_regular_expression(regex_match "[.][h|c]$") - -include_directories(${FLTKZLIB_SOURCE_DIR}) -include_directories(${FLTKZLIB_BINARY_DIR}) # source files for zlib set(ZLIB_SRCS - adler32.c compress.c crc32.c deflate.c + adler32.c compress.c crc32.c deflate.c gzclose.c gzlib.c gzread.c gzwrite.c - inffast.c infback.c inflate.c inftrees.c + inffast.c infback.c inflate.c inftrees.c trees.c uncompr.c zutil.c ) ####################################################################### -add_library(fltk_z ${ZLIB_SRCS}) +FL_ADD_LIBRARY(fltk_z STATIC "${ZLIB_SRCS}") -if(MSVC) - set_target_properties(fltk_z - PROPERTIES - OUTPUT_NAME zlib - DEBUG_OUTPUT_NAME zlibd - ) - if(OPTION_LARGE_FILE) - set_target_properties(fltk_z PROPERTIES LINK_FLAGS /LARGEADDRESSAWARE) - endif(OPTION_LARGE_FILE) -endif(MSVC) +####################################################################### +if(OPTION_BUILD_SHARED_LIBS) +####################################################################### +FL_ADD_LIBRARY(fltk_z SHARED "${ZLIB_SRCS}") -install(TARGETS fltk_z - EXPORT fltk-install - DESTINATION ${PREFIX_LIB} -) +####################################################################### +endif(OPTION_BUILD_SHARED_LIBS) +####################################################################### |