[Cmake-commits] CMake branch, next, updated. v2.8.2-890-g0e2bd2b

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  0e2bd2bb1e3fb2af2b9cfbaad6f9363f8d42a52a (commit)
       via  a6628d154a5bbdd7a41f0791df26eb55f18a3a3e (commit)
      from  6dcadbcba00c1204b94f05e70e905ccca314891c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e2bd2bb1e3fb2af2b9cfbaad6f9363f8d42a52a
commit 0e2bd2bb1e3fb2af2b9cfbaad6f9363f8d42a52a
Merge: 6dcadbc a6628d1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 21 17:30:27 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 21 17:30:27 2010 -0400

    Merge topic 'find-fltk-cygwin' into next
    
    a6628d1 FindFLTK*: Use Cygwin fltk on Cygwin


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a6628d154a5bbdd7a41f0791df26eb55f18a3a3e
commit a6628d154a5bbdd7a41f0791df26eb55f18a3a3e
Author:     Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
AuthorDate: Tue Sep 21 17:28:34 2010 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 21 17:29:22 2010 -0400

    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.

diff --git a/Modules/FindFLTK.cmake b/Modules/FindFLTK.cmake
index 6d51277..03d4b8e 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 43409d3..436e280 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})

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindFLTK.cmake  |    5 -----
 Modules/FindFLTK2.cmake |    4 ----
 2 files changed, 0 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake