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 /png | |
| 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 'png')
| -rw-r--r-- | png/CMakeLists.txt | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/png/CMakeLists.txt b/png/CMakeLists.txt index 8cd41114f..4ebb90529 100644 --- a/png/CMakeLists.txt +++ b/png/CMakeLists.txt @@ -1,11 +1,3 @@ -project(FLTKPNG) -include_regular_expression("^png.*[.][c|h]$") - -include_directories(${FLTKZLIB_SOURCE_DIR}) -include_directories(${ZLIB_INCLUDE_DIR}) - -include_directories(${FLTKPNG_SOURCE_DIR}) -include_directories(${FLTKPNG_BINARY_DIR}) # source files for png set(PNG_SRCS @@ -16,20 +8,25 @@ set(PNG_SRCS ) ####################################################################### -add_library(fltk_png ${PNG_SRCS}) +FL_ADD_LIBRARY(fltk_png STATIC "${PNG_SRCS}") -if(MSVC) - set_target_properties(fltk_png PROPERTIES OUTPUT_NAME fltkpng) - if(OPTION_LARGE_FILE) - set_target_properties(fltk_png PROPERTIES LINK_FLAGS /LARGEADDRESSAWARE) - endif(OPTION_LARGE_FILE) +if(OPTION_USE_SYSTEM_ZLIB) + target_link_libraries(fltk_png ${FLTK_ZLIB_LIBRARIES}) else() - set_target_properties(fltk_png PROPERTIES OUTPUT_NAME fltk_png) -endif(MSVC) + target_link_libraries(fltk_png fltk_z) +endif(OPTION_USE_SYSTEM_ZLIB) -target_link_libraries(fltk_png ${FLTK_ZLIB_LIBRARIES}) +####################################################################### +if(OPTION_BUILD_SHARED_LIBS) +####################################################################### +FL_ADD_LIBRARY(fltk_png SHARED "${PNG_SRCS}") -install(TARGETS fltk_png - EXPORT fltk-install - DESTINATION ${PREFIX_LIB} -) +if(OPTION_USE_SYSTEM_ZLIB) + target_link_libraries(fltk_png_SHARED ${FLTK_ZLIB_LIBRARIES}) +else() + target_link_libraries(fltk_png_SHARED fltk_z_SHARED) +endif(OPTION_USE_SYSTEM_ZLIB) + +####################################################################### +endif(OPTION_BUILD_SHARED_LIBS) +####################################################################### |