diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2005-02-24 20:26:22 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2005-02-24 20:26:22 +0000 |
| commit | 3ee9c501802f598eadf1e3d7bc67e2e10af47d71 (patch) | |
| tree | e51691c00b94474572ccc55f5740747675577834 /CMakeLists.txt | |
| parent | 36402b7fe5ed6aa6912e80f05186a24cbc48cea2 (diff) | |
CMake build fixes (STR #724)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4047 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4fab4e4a1..350c33fdf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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") |