1 files changed, 27 insertions, 22 deletions
diff --git a/png/CMakeLists.txt b/png/CMakeLists.txt
index eb2984885..8cd41114f 100644
--- a/png/CMakeLists.txt
+++ b/png/CMakeLists.txt
@@ -1,30 +1,35 @@
-PROJECT(FLTKPNG)
-INCLUDE_REGULAR_EXPRESSION("^png.*$")
+project(FLTKPNG)
+include_regular_expression("^png.*[.][c|h]$")
 
-INCLUDE_DIRECTORIES(${FLTKZLIB_SOURCE_DIR})
+include_directories(${FLTKZLIB_SOURCE_DIR})
+include_directories(${ZLIB_INCLUDE_DIR})
 
-IF(ZLIB_INCLUDE_DIR)
-  INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
-ENDIF(ZLIB_INCLUDE_DIR)
-
-INCLUDE_DIRECTORIES(${FLTKPNG_SOURCE_DIR})
-INCLUDE_DIRECTORIES(${FLTKPNG_BINARY_DIR})
+include_directories(${FLTKPNG_SOURCE_DIR})
+include_directories(${FLTKPNG_BINARY_DIR})
 
 # source files for png
-SET(PNG_SRCS
+set(PNG_SRCS
   pngget.c    pngrio.c    pngwrite.c
   png.c       pngmem.c    pngrtran.c  pngtrans.c  pngwtran.c
   pngerror.c  pngpread.c  pngrutil.c  pngwutil.c
   pngread.c   pngset.c   pngwio.c
-  )
-
-ADD_LIBRARY(fltk_png ${PNG_SRCS})
-INSTALL_TARGETS(/lib fltk_png)
-
-
-IF(UNIX)
-  TARGET_LINK_LIBRARIES(fltk_png ${FLTK_ZLIB_LIBRARIES} -lm)
-ELSE(UNIX)
-  TARGET_LINK_LIBRARIES(fltk_png ${FLTK_ZLIB_LIBRARIES})
-ENDIF(UNIX)
-
+)
+
+#######################################################################
+add_library(fltk_png ${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)
+else()
+   set_target_properties(fltk_png PROPERTIES OUTPUT_NAME fltk_png)
+endif(MSVC)
+
+target_link_libraries(fltk_png ${FLTK_ZLIB_LIBRARIES})
+
+install(TARGETS fltk_png
+   EXPORT fltk-install
+   DESTINATION ${PREFIX_LIB}
+)