mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake build fixes (STR #724)

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4047 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 2005-02-24 20:26:22 +00:00
parent 36402b7fe5
commit 3ee9c50180
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -1,6 +1,7 @@
CHANGES IN FLTK 1.1.7
- Documentation fixes (STR #648, STR #692)
- CMake build fixes (STR #724)
- Fl_Browser::swap() didn't handle redraws properly when
the swapped lines had different heights (STR #729)
- FL_MOUSEWHEEL events are now sent first to the widget

9
CMakeLists.txt
View File

@ -189,6 +189,9 @@ ELSE(FLTK_USE_SYSTEM_ZLIB)
MARK_AS_ADVANCED(ZLIB_INCLUDE_DIR)
MARK_AS_ADVANCED(ZLIB_LIBRARY)
SUBDIRS(zlib)
SET(HAVE_LIBZ 1)
SET(FLTK_ZLIB_LIBRARIES fltk_zlib)
INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/zlib")
ENDIF(FLTK_USE_SYSTEM_ZLIB)
# Set an option to build the jpeg library or not
@ -203,6 +206,9 @@ ELSE(FLTK_USE_SYSTEM_JPEG)
MARK_AS_ADVANCED(JPEG_INCLUDE_DIR)
MARK_AS_ADVANCED(JPEG_LIBRARY)
SUBDIRS(jpeg)
SET(HAVE_LIBJPEG 1)
SET(JPEG_LIBRARIES fltk_jpeg)
INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/jpeg")
ENDIF(FLTK_USE_SYSTEM_JPEG)
# Set an option to build the png library or not
@ -220,6 +226,9 @@ ELSE(FLTK_USE_SYSTEM_PNG)
MARK_AS_ADVANCED(PNG_INCLUDE_DIR)
MARK_AS_ADVANCED(PNG_LIBRARY)
SUBDIRS(png)
SET(HAVE_LIBPNG 1)
SET(PNG_LIBRARIES fltk_png)
INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/png")
ENDIF(FLTK_USE_SYSTEM_PNG)
SET(FLTK_DATADIR "${CMAKE_INSTALL_PREFIX}/share/FLTK")

16
png/CMakeLists.txt
View File

@ -4,7 +4,7 @@ INCLUDE_REGULAR_EXPRESSION("^png.*$")
INCLUDE_DIRECTORIES(${FLTKZLIB_SOURCE_DIR})
IF(ZLIB_INCLUDE_DIR)
INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
ENDIF(ZLIB_INCLUDE_DIR)
INCLUDE_DIRECTORIES(${FLTKPNG_SOURCE_DIR})
@ -12,17 +12,17 @@ INCLUDE_DIRECTORIES(${FLTKPNG_BINARY_DIR})
# source files for png
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
)
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})
IF(UNIX)
TARGET_LINK_LIBRARIES(fltk_png ${FLTK_ZLIB_LIBRARIES} -lm)
TARGET_LINK_LIBRARIES(fltk_png ${FLTK_ZLIB_LIBRARIES} -lm)
ELSE(UNIX)
TARGET_LINK_LIBRARIES(fltk_png ${FLTK_ZLIB_LIBRARIES})
TARGET_LINK_LIBRARIES(fltk_png ${FLTK_ZLIB_LIBRARIES})
ENDIF(UNIX)