Merge topic 'find-fltk-cygwin'
a6628d1
FindFLTK*: Use Cygwin fltk on Cygwin
This commit is contained in:
commit
89884a26fd
|
@ -67,11 +67,6 @@ IF(APPLE)
|
||||||
SET( FLTK_PLATFORM_DEPENDENT_LIBS "-framework Carbon -framework Cocoa -framework ApplicationServices -lz")
|
SET( FLTK_PLATFORM_DEPENDENT_LIBS "-framework Carbon -framework Cocoa -framework ApplicationServices -lz")
|
||||||
ENDIF(APPLE)
|
ENDIF(APPLE)
|
||||||
|
|
||||||
IF(CYGWIN)
|
|
||||||
FIND_LIBRARY(FLTK_MATH_LIBRARY m)
|
|
||||||
SET( FLTK_PLATFORM_DEPENDENT_LIBS ole32 uuid comctl32 wsock32 supc++ ${FLTK_MATH_LIBRARY} -lgdi32)
|
|
||||||
ENDIF(CYGWIN)
|
|
||||||
|
|
||||||
# If FLTK_INCLUDE_DIR is already defined we assigne its value to FLTK_DIR
|
# If FLTK_INCLUDE_DIR is already defined we assigne its value to FLTK_DIR
|
||||||
IF(FLTK_INCLUDE_DIR)
|
IF(FLTK_INCLUDE_DIR)
|
||||||
SET(FLTK_DIR ${FLTK_INCLUDE_DIR})
|
SET(FLTK_DIR ${FLTK_INCLUDE_DIR})
|
||||||
|
|
|
@ -45,10 +45,6 @@ IF(APPLE)
|
||||||
SET( FLTK2_PLATFORM_DEPENDENT_LIBS "-framework Carbon -framework Cocoa -framework ApplicationServices -lz")
|
SET( FLTK2_PLATFORM_DEPENDENT_LIBS "-framework Carbon -framework Cocoa -framework ApplicationServices -lz")
|
||||||
ENDIF(APPLE)
|
ENDIF(APPLE)
|
||||||
|
|
||||||
IF(CYGWIN)
|
|
||||||
SET( FLTK2_PLATFORM_DEPENDENT_LIBS ole32 uuid comctl32 wsock32 supc++ -lm -lgdi32)
|
|
||||||
ENDIF(CYGWIN)
|
|
||||||
|
|
||||||
# If FLTK2_INCLUDE_DIR is already defined we assigne its value to FLTK2_DIR
|
# If FLTK2_INCLUDE_DIR is already defined we assigne its value to FLTK2_DIR
|
||||||
IF(FLTK2_INCLUDE_DIR)
|
IF(FLTK2_INCLUDE_DIR)
|
||||||
SET(FLTK2_DIR ${FLTK2_INCLUDE_DIR})
|
SET(FLTK2_DIR ${FLTK2_INCLUDE_DIR})
|
||||||
|
|
Loading…
Reference in New Issue