From a6628d154a5bbdd7a41f0791df26eb55f18a3a3e Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 21 Sep 2010 17:28:34 -0400 Subject: [PATCH] FindFLTK*: Use Cygwin fltk on Cygwin Do not set FLTK_PLATFORM_DEPENDENT_LIBS to contain win32 libraries. Cygwin builds should use the fltk that comes with Cygwin. --- Modules/FindFLTK.cmake | 5 ----- Modules/FindFLTK2.cmake | 4 ---- 2 files changed, 9 deletions(-) diff --git a/Modules/FindFLTK.cmake b/Modules/FindFLTK.cmake index 6d51277ae..03d4b8e14 100644 --- a/Modules/FindFLTK.cmake +++ b/Modules/FindFLTK.cmake @@ -67,11 +67,6 @@ IF(APPLE) SET( FLTK_PLATFORM_DEPENDENT_LIBS "-framework Carbon -framework Cocoa -framework ApplicationServices -lz") 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) SET(FLTK_DIR ${FLTK_INCLUDE_DIR}) diff --git a/Modules/FindFLTK2.cmake b/Modules/FindFLTK2.cmake index 43409d3b6..436e280bc 100644 --- a/Modules/FindFLTK2.cmake +++ b/Modules/FindFLTK2.cmake @@ -45,10 +45,6 @@ IF(APPLE) SET( FLTK2_PLATFORM_DEPENDENT_LIBS "-framework Carbon -framework Cocoa -framework ApplicationServices -lz") 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) SET(FLTK2_DIR ${FLTK2_INCLUDE_DIR})