cvs: gd /libgd CMakeLists.txt

pajoye		Sun Jan 13 21:23:45 2008 UTC

  Modified files:              
    /gd/libgd	CMakeLists.txt 
  Log:
  - ws
  
http://cvs.php.net/viewvc.cgi/gd/libgd/CMakeLists.txt?r1=1.13&r2=1.14&diff_format=u
Index: gd/libgd/CMakeLists.txt
diff -u gd/libgd/CMakeLists.txt:1.13 gd/libgd/CMakeLists.txt:1.14
--- gd/libgd/CMakeLists.txt:1.13	Sun Jan 13 21:11:35 2008
+++ gd/libgd/CMakeLists.txt	Sun Jan 13 21:23:45 2008
@@ -1,4 +1,4 @@
-# $Id: CMakeLists.txt,v 1.13 2008/01/13 21:11:35 pajoye Exp $
+# $Id: CMakeLists.txt,v 1.14 2008/01/13 21:23:45 pajoye Exp $
 
 SET(PACKAGE GD)
 SET(PACKAGE_NAME GD)
@@ -82,9 +82,7 @@
 		FIND_PACKAGE(PNG REQUIRED)
 	endif (ENABLE_PNG)
 
-	if (ENABLE_PNG)
-		FIND_PACKAGE(ZLIB)
-	endif (ENABLE_PNG)
+	FIND_PACKAGE(ZLIB)
 
 	if (ENABLE_JPEG)
 		FIND_PACKAGE(JPEG)
@@ -94,9 +92,9 @@
 		FIND_PACKAGE(TIFF)
 	endif (ENABLE_TIFF)
 
-	IF (NOT WIN32)
+	if (NOT WIN32)
 		FIND_PACKAGE(PTHREAD)
-	ENDIF (NOT WIN32)
+	endif (NOT WIN32)
 
 	if (ENABLE_FREETYPE)
 		FIND_PACKAGE(Freetype)
@@ -110,6 +108,8 @@
 		FIND_PACKAGE(Fontconfig)
 	endif (ENABLE_FONTCONFIG)
 
+
+
 	if (FREETYPE_FOUND)
 		INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIR})
 		SET(HAVE_FT2BUILD_H 1)
@@ -162,15 +162,16 @@
 	if (WIN32)
 		SET(GD_LIB bgd)
 		ADD_DEFINITIONS( -DWIN32 -D_WIN32 -DMSWIN32 -DBGDWIN32 -DWINVER=0x0500  -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0600)
-	else(WIN32)
+	else (WIN32)
 		SET(GD_LIB gd)
-	endif(WIN32)
+	endif (WIN32)
 
 	SET(GD_INCLUDE_DIR "${GD_SOURCE_DIR}/src" "${GD_SOURCE_DIR}")
 	INCLUDE_DIRECTORIES(before ${FONTCONFIG_INCLUDE_DIR})
 
 	add_subdirectory(src)
 endif (USE_EXT_GD)
+
 add_subdirectory(tests)
 add_subdirectory(examples)