1 files changed, 35 insertions, 20 deletions
diff --git a/jpeg/CMakeLists.txt b/jpeg/CMakeLists.txt
index eb05c48a3..2b41aee7c 100644
--- a/jpeg/CMakeLists.txt
+++ b/jpeg/CMakeLists.txt
@@ -1,36 +1,51 @@
-PROJECT(FLTKJPEG)
+project(FLTKJPEG)
 
-INCLUDE_REGULAR_EXPRESSION("^(jchuff|jconfig|jdct|jdhuff|jerror|jinclude|jmemsys|jmorecfg|jpegint|jpeglib|jversion|jpeg).*$")
+include_regular_expression("^j.*[.][c|h]$")
 
-INCLUDE_DIRECTORIES(${FLTKJPEG_SOURCE_DIR})
-INCLUDE_DIRECTORIES(${FLTKJPEG_BINARY_DIR})
+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.
 # This is the recommended mode for Win32 anyway.)
-SET(systemdependent_SRCS jmemnobs.c)
+set(systemdependent_SRCS jmemnobs.c)
 
 # library object files common to compression and decompression
-SET(common_SRCS
-jcomapi.c jutils.c jerror.c jmemmgr.c
+set(common_SRCS
+   jcomapi.c jutils.c jerror.c jmemmgr.c
 )
 
 # compression library object files
-SET(compression_SRCS
-jcapimin.c jcapistd.c jctrans.c jcparam.c jdatadst.c jcinit.c
-jcmaster.c jcmarker.c jcmainct.c jcprepct.c jccoefct.c jccolor.c
-jcsample.c jchuff.c jcphuff.c jcdctmgr.c jfdctfst.c jfdctflt.c
-jfdctint.c
+set(compression_SRCS
+   jcapimin.c jcapistd.c jctrans.c jcparam.c jdatadst.c jcinit.c
+   jcmaster.c jcmarker.c jcmainct.c jcprepct.c jccoefct.c jccolor.c
+   jcsample.c jchuff.c jcphuff.c jcdctmgr.c jfdctfst.c jfdctflt.c
+   jfdctint.c
 )
 
 # decompression library object files
-SET(decompression_SRCS
-jdapimin.c jdapistd.c jdtrans.c jdatasrc.c jdmaster.c
-jdinput.c jdmarker.c jdhuff.c jdphuff.c jdmainct.c jdcoefct.c
-jdpostct.c jddctmgr.c jidctfst.c jidctflt.c jidctint.c jidctred.c
-jdsample.c jdcolor.c jquant1.c jquant2.c jdmerge.c
+set(decompression_SRCS
+   jdapimin.c jdapistd.c jdtrans.c jdatasrc.c jdmaster.c
+   jdinput.c jdmarker.c jdhuff.c jdphuff.c jdmainct.c jdcoefct.c
+   jdpostct.c jddctmgr.c jidctfst.c jidctflt.c jidctint.c jidctred.c
+   jdsample.c jdcolor.c jquant1.c jquant2.c jdmerge.c
 )
 
-ADD_LIBRARY(fltk_jpeg ${systemdependent_SRCS} ${common_SRCS} ${compression_SRCS} ${decompression_SRCS})
-INSTALL_TARGETS(/lib fltk_jpeg)
-
+#######################################################################
+add_library(fltk_jpeg ${systemdependent_SRCS} ${common_SRCS} ${compression_SRCS} ${decompression_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)
+
+install(TARGETS fltk_jpeg
+   EXPORT fltk-install
+   DESTINATION ${PREFIX_LIB}
+)