diff options
| author | Luis Ibanez <luis.ibanez@kitware.com> | 2002-08-05 22:08:46 (GMT) |
|---|---|---|
| committer | Luis Ibanez <luis.ibanez@kitware.com> | 2002-08-05 22:08:46 (GMT) |
| commit | 559d99e97d9d64bbdb62e9570dd97082bd914d71 (patch) | |
| tree | fbb156686b9cd5cc86fc2ad41174053beec299f9 | |
| parent | ab2dc5558b339a4969b9ff679d4f75a5f11618a0 (diff) | |
| download | CMake-559d99e97d9d64bbdb62e9570dd97082bd914d71.zip CMake-559d99e97d9d64bbdb62e9570dd97082bd914d71.tar.gz CMake-559d99e97d9d64bbdb62e9570dd97082bd914d71.tar.bz2 | |
ENH: Images library added. Names for debuggin versions in windows added.
| -rw-r--r-- | Modules/FindFLTK.cmake | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/Modules/FindFLTK.cmake b/Modules/FindFLTK.cmake index 87d6df3..bde27c4 100644 --- a/Modules/FindFLTK.cmake +++ b/Modules/FindFLTK.cmake @@ -32,7 +32,7 @@ H:/usr/local/fltk # So the FLTK_LIBRARY does not appear the first time
IF(FLTK_INCLUDE_PATH)
IF(USE_FLTK_VERSION_1.0.11)
- FIND_LIBRARY(FLTK_BASE_LIBRARY fltk
+ FIND_LIBRARY(FLTK_BASE_LIBRARY NAMES fltk fltkd
PATHS /usr/lib /usr/local/lib /usr/local/fltk/lib H:/usr/local/fltk/lib /usr/X11R6/lib
${FLTK_INCLUDE_PATH}/lib
)
@@ -40,21 +40,25 @@ IF(FLTK_INCLUDE_PATH) IF(USE_FLTK_VERSION_1.1)
- FIND_LIBRARY(FLTK_BASE_LIBRARY fltk
+ FIND_LIBRARY(FLTK_BASE_LIBRARY NAMES fltk fltkd
PATHS /usr/lib /usr/local/lib /usr/local/fltk/lib H:/usr/local/fltk/lib /usr/X11R6/lib
${FLTK_INCLUDE_PATH}/lib
)
- FIND_LIBRARY(FLTK_GL_LIBRARY NAMES fltkgl fltk_gl
+ FIND_LIBRARY(FLTK_GL_LIBRARY NAMES fltkgl fltkgld fltk_gl
PATHS /usr/lib /usr/local/lib /usr/local/fltk/lib H:/usr/local/fltk/lib /usr/X11R6/lib
${FLTK_INCLUDE_PATH}/lib
)
- FIND_LIBRARY(FLTK_FORMS_LIBRARY NAMES fltkforms fltk_forms
+ FIND_LIBRARY(FLTK_FORMS_LIBRARY NAMES fltkforms fltkformsd fltk_forms
+ PATHS /usr/lib /usr/local/lib /usr/local/fltk/lib H:/usr/local/fltk/lib /usr/X11R6/lib
+ ${FLTK_INCLUDE_PATH}/lib
+ )
+ FIND_LIBRARY(FLTK_IMAGES_LIBRARY NAMES fltkimages fltkimagesd fltk_images
PATHS /usr/lib /usr/local/lib /usr/local/fltk/lib H:/usr/local/fltk/lib /usr/X11R6/lib
${FLTK_INCLUDE_PATH}/lib
)
ENDIF(USE_FLTK_VERSION_1.1)
- SET( FLTK_LIBRARY ${FLTK_BASE_LIBRARY} ${FLTK_GL_LIBRARY} ${FLTK_FORMS_LIBRARY} )
+ SET( FLTK_LIBRARY ${FLTK_BASE_LIBRARY} ${FLTK_GL_LIBRARY} ${FLTK_FORMS_LIBRARY} ${FLTK_IMAGES_LIBRARY} )
ENDIF(FLTK_INCLUDE_PATH)
|