diff options
| author | Dejan Lekic <dejan.lekic@gmail.com> | 2005-08-06 05:02:56 +0000 |
|---|---|---|
| committer | Dejan Lekic <dejan.lekic@gmail.com> | 2005-08-06 05:02:56 +0000 |
| commit | 1cd06f3ad011f8be3c01fbc7cac10ce823805855 (patch) | |
| tree | a390daf29a40ef886fa8c057ede8e76a3a785704 /src | |
| parent | 289434a6e2435970187db695b13839054260eca8 (diff) | |
This commit contains patch submitted by "fltk.x0" (thanks fltk.x0!) in the middle of May this year - STR #863. Also small change in fluid.cxx - time.h was needed for successful build on MinGW.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4468 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a275908bf..26d762fff 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -161,6 +161,7 @@ SET(CFILES ) ADD_LIBRARY(fltk ${CPPFILES} ${CFILES}) +INSTALL_TARGETS(/lib fltk) SET_TARGET_PROPERTIES(fltk PROPERTIES VERSION ${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR} @@ -174,6 +175,7 @@ ENDIF(X11_FOUND) IF(OPENGL_FOUND) ADD_LIBRARY(fltk_gl ${GLCPPFILES}) + INSTALL_TARGETS(/lib fltk_gl) TARGET_LINK_LIBRARIES(fltk_gl fltk ${OPENGL_LIBRARIES}) SET_TARGET_PROPERTIES(fltk_gl PROPERTIES @@ -182,6 +184,7 @@ IF(OPENGL_FOUND) ENDIF(OPENGL_FOUND) ADD_LIBRARY(fltk_forms ${FLCPPFILES}) +INSTALL_TARGETS(/lib fltk_forms) TARGET_LINK_LIBRARIES(fltk_forms fltk) SET_TARGET_PROPERTIES(fltk_forms PROPERTIES @@ -189,21 +192,11 @@ SET_TARGET_PROPERTIES(fltk_forms SOVERSION ${FLTK_VERSION_PATCH}) ADD_LIBRARY(fltk_images ${IMGCPPFILES}) -TARGET_LINK_LIBRARIES(fltk_images fltk) +INSTALL_TARGETS(/lib fltk_images) +TARGET_LINK_LIBRARIES(fltk_images fltk ${FLTK_PNG_LIBRARIES} + ${FLTK_JPEG_LIBRARIES} ${FLTK_ZLIB_LIBRARIES}) SET_TARGET_PROPERTIES(fltk_images PROPERTIES VERSION ${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR} SOVERSION ${FLTK_VERSION_PATCH}) -IF(HAVE_LIBPNG) - TARGET_LINK_LIBRARIES(fltk_images ${PNG_LIBRARIES}) -ENDIF(HAVE_LIBPNG) - -IF(HAVE_LIBJPEG) - TARGET_LINK_LIBRARIES(fltk_images ${JPEG_LIBRARIES}) -ENDIF(HAVE_LIBJPEG) - -INSTALL_TARGETS(/lib fltk) -INSTALL_TARGETS(/lib fltk_gl) -INSTALL_TARGETS(/lib fltk_forms) -INSTALL_TARGETS(/lib fltk_images) |