[Plplot-cvs] plplot/cmake/modules FindGD.cmake,1.5,1.6

[Werner S. <sm...@us...>]

Update of /cvsroot/plplot/plplot/cmake/modules
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31200/cmake/modules

Modified Files:
	FindGD.cmake 
Log Message:
Added Win32 support. For Win32 compilers (not cygwin) the cmake file looks for the bgd library using the dll package from here: http://www.boutell.com/gd/ . Don't check for png and jpeg since it's compiled in.

Also small code changes: if jpeg or png library is not found not the whole gd library is turned off (GD_FOUND "NO") - instead only this part of the driver is turned off (SET(GD_SUPPORTS_JPEG "NO")).

Index: FindGD.cmake
===================================================================
RCS file: /cvsroot/plplot/plplot/cmake/modules/FindGD.cmake,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- FindGD.cmake	2 Aug 2006 17:17:58 -0000	1.5
+++ FindGD.cmake	31 Oct 2006 19:49:14 -0000	1.6
@@ -14,7 +14,12 @@
 /usr/include
 )
 
-SET(GD_NAMES ${GD_NAMES} gd)
+if(WIN32 AND NOT CYGWIN)
+  SET(GD_NAMES ${GD_NAMES} bgd)
+else(WIN32)
+  SET(GD_NAMES ${GD_NAMES} gd)
+endif(WIN32 AND NOT CYGWIN)
+
 FIND_LIBRARY(GD_LIBRARY
   NAMES ${GD_NAMES}
   PATHS /usr/lib /usr/local/lib
@@ -28,64 +33,70 @@
 ENDIF (GD_LIBRARY AND GD_INCLUDE_DIR)
 
 IF (GD_FOUND)
-   INCLUDE(CheckLibraryExists)
-   GET_FILENAME_COMPONENT(GD_LIB_PATH ${GD_LIBRARY} PATH)
-   GET_FILENAME_COMPONENT(GD_LIB ${GD_LIBRARY} NAME)
+  IF (WIN32 AND NOT CYGWIN)
+    SET(GD_SUPPORTS_PNG ON)
+    SET(GD_SUPPORTS_JPEG ON)
+    SET(GD_SUPPORTS_GIF ON)
+    get_filename_component(GD_LIBRARY_DIR ${GD_LIBRARY} PATH)
+  ELSE (WIN32 AND NOT CYGWIN)
+    INCLUDE(CheckLibraryExists)
+    GET_FILENAME_COMPONENT(GD_LIB_PATH ${GD_LIBRARY} PATH)
+    GET_FILENAME_COMPONENT(GD_LIB ${GD_LIBRARY} NAME)
 
-   CHECK_LIBRARY_EXISTS("${GD_LIBRARY}" "gdImagePng" "${GD_LIB_PATH}" GD_SUPPORTS_PNG)
-   IF (GD_SUPPORTS_PNG)
+    CHECK_LIBRARY_EXISTS("${GD_LIBRARY}" "gdImagePng" "${GD_LIB_PATH}" GD_SUPPORTS_PNG)
+    IF (GD_SUPPORTS_PNG)
      find_package(PNG)
      IF (PNG_FOUND)
        SET(GD_LIBRARIES ${GD_LIBRARIES} ${PNG_LIBRARIES})
        SET(GD_INCLUDE_DIR ${GD_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
      ELSE (PNG_FOUND)
-       SET(GD_FOUND "NO")
+       SET(GD_SUPPORTS_PNG "NO")
      ENDIF (PNG_FOUND)
-   ENDIF (GD_SUPPORTS_PNG)
+    ENDIF (GD_SUPPORTS_PNG)
 
-   CHECK_LIBRARY_EXISTS("${GD_LIBRARY}" "gdImageJpeg" "${GD_LIB_PATH}" GD_SUPPORTS_JPEG)
-   IF (GD_SUPPORTS_JPEG)
+    CHECK_LIBRARY_EXISTS("${GD_LIBRARY}" "gdImageJpeg" "${GD_LIB_PATH}" GD_SUPPORTS_JPEG)
+    IF (GD_SUPPORTS_JPEG)
      find_package(JPEG)
      IF (JPEG_FOUND)
        SET(GD_LIBRARIES ${GD_LIBRARIES} ${JPEG_LIBRARIES})
        SET(GD_INCLUDE_DIR ${GD_INCLUDE_DIR} ${JPEG_INCLUDE_DIR})
      ELSE (JPEG_FOUND)
-       SET(GD_FOUND "NO")
+       SET(GD_SUPPORTS_JPEG "NO")
      ENDIF (JPEG_FOUND)
-   ENDIF (GD_SUPPORTS_JPEG)
+    ENDIF (GD_SUPPORTS_JPEG)
 
-   CHECK_LIBRARY_EXISTS("${GD_LIBRARY}" "gdImageGif" "${GD_LIB_PATH}" GD_SUPPORTS_GIF)
+    CHECK_LIBRARY_EXISTS("${GD_LIBRARY}" "gdImageGif" "${GD_LIB_PATH}" GD_SUPPORTS_GIF)
 
-   # Trim the list of include directories
-   SET(GDINCTRIM)
-   FOREACH(GD_DIR ${GD_INCLUDE_DIR})
+    # Trim the list of include directories
+    SET(GDINCTRIM)
+    FOREACH(GD_DIR ${GD_INCLUDE_DIR})
     SET(GD_TMP_FOUND OFF)
     FOREACH(GD_TRIMMED ${GDINCTRIM})
       IF ("${GD_DIR}" STREQUAL "${GD_TRIMMED}")
-	SET(GD_TMP_FOUND ON)
+    SET(GD_TMP_FOUND ON)
       ENDIF ("${GD_DIR}" STREQUAL "${GD_TRIMMED}")
     ENDFOREACH(GD_TRIMMED ${GDINCTRIM})
     IF (NOT GD_TMP_FOUND)
       SET(GDINCTRIM "${GDINCTRIM}" "${GD_DIR}")
     ENDIF (NOT GD_TMP_FOUND)
-  ENDFOREACH(GD_DIR ${GD_INCLUDE_DIR})
-  SET(GD_INCLUDE_DIR ${GDINCTRIM})
+    ENDFOREACH(GD_DIR ${GD_INCLUDE_DIR})
+    SET(GD_INCLUDE_DIR ${GDINCTRIM})
 
-  SET(GD_LIBRARY_DIR)
-  # Generate trimmed list of library directories and list of libraries
-  FOREACH(GD_LIB ${GD_LIBRARIES})
+    SET(GD_LIBRARY_DIR)
+    # Generate trimmed list of library directories and list of libraries
+    FOREACH(GD_LIB ${GD_LIBRARIES})
     GET_FILENAME_COMPONENT(GD_NEXTLIBDIR ${GD_LIB} PATH)
     SET(GD_TMP_FOUND OFF)
     FOREACH(GD_LIBDIR ${GD_LIBRARY_DIR})
       IF ("${GD_NEXTLIBDIR}" STREQUAL "${GD_LIBDIR}")
-	SET(GD_TMP_FOUND ON)
+    SET(GD_TMP_FOUND ON)
       ENDIF ("${GD_NEXTLIBDIR}" STREQUAL "${GD_LIBDIR}")
     ENDFOREACH(GD_LIBDIR ${GD_LIBRARIES})
     IF (NOT GD_TMP_FOUND)
       SET(GD_LIBRARY_DIR "${GD_LIBRARY_DIR}" "${GD_NEXTLIBDIR}")
     ENDIF (NOT GD_TMP_FOUND)
-  ENDFOREACH(GD_LIB ${GD_LIBRARIES})
-
+    ENDFOREACH(GD_LIB ${GD_LIBRARIES})
+  ENDIF (WIN32 AND NOT CYGWIN)
 ENDIF (GD_FOUND)
 
 IF (GD_FOUND)