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 /jpeg | |
| 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 'jpeg')
| -rw-r--r-- | jpeg/CMakeLists.txt | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/jpeg/CMakeLists.txt b/jpeg/CMakeLists.txt index ef1431784..20e215b63 100644 --- a/jpeg/CMakeLists.txt +++ b/jpeg/CMakeLists.txt @@ -1,9 +1,3 @@ -project(FLTKJPEG) - -include_regular_expression("^j.*[.][c|h]$") - -include_directories(${FLTKJPEG_SOURCE_DIR}) -include_directories(${FLTKJPEG_BINARY_DIR}) # memmgr back ends: compile only one of these into a working library # (For now, let's use the mode that requires the image fit into memory. @@ -31,21 +25,16 @@ set(decompression_SRCS jdsample.c jdcolor.c jquant1.c jquant2.c jdmerge.c ) +list(APPEND BUILD_SRCS "${systemdependent_SRCS};${common_SRCS}") +list(APPEND BUILD_SRCS "${compression_SRCS};${decompression_SRCS}") ####################################################################### -add_library(fltk_jpeg ${systemdependent_SRCS} ${common_SRCS} ${compression_SRCS} ${decompression_SRCS}) +FL_ADD_LIBRARY(fltk_jpeg STATIC "${BUILD_SRCS}") -if(MSVC) - set_target_properties(fltk_jpeg - PROPERTIES - OUTPUT_NAME fltkjpeg - DEBUG_OUTPUT_NAME fltkjpegd - ) - if(OPTION_LARGE_FILE) - set_target_properties(fltk_jpeg PROPERTIES LINK_FLAGS /LARGEADDRESSAWARE) - endif(OPTION_LARGE_FILE) -endif(MSVC) +####################################################################### +if(OPTION_BUILD_SHARED_LIBS) +####################################################################### +FL_ADD_LIBRARY(fltk_jpeg SHARED "${BUILD_SRCS}") -install(TARGETS fltk_jpeg - EXPORT fltk-install - DESTINATION ${PREFIX_LIB} -) +####################################################################### +endif(OPTION_BUILD_SHARED_LIBS) +####################################################################### |