cvs: gd /libgd CMakeLists.txt

pajoye		Mon May  5 08:46:54 2008 UTC

  Modified files:              
    /gd/libgd	CMakeLists.txt 
  Log:
  - more mingw fixes 
  - use the correct JPEG path
  
http://cvs.php.net/viewvc.cgi/gd/libgd/CMakeLists.txt?r1=1.19&r2=1.20&diff_format=u
Index: gd/libgd/CMakeLists.txt
diff -u gd/libgd/CMakeLists.txt:1.19 gd/libgd/CMakeLists.txt:1.20
--- gd/libgd/CMakeLists.txt:1.19	Sun Apr 20 12:30:16 2008
+++ gd/libgd/CMakeLists.txt	Mon May  5 08:46:54 2008
@@ -1,4 +1,4 @@
-# $Id: CMakeLists.txt,v 1.19 2008/04/20 12:30:16 pajoye Exp $
+# $Id: CMakeLists.txt,v 1.20 2008/05/05 08:46:54 pajoye Exp $
 
 SET(PACKAGE GD)
 SET(PACKAGE_NAME GD)
@@ -20,7 +20,6 @@
 	ENABLE_TESTING()
 endif(BUILD_TEST)
 
-
 if (NOT WIN32)
 	if(CMAKE_BUILD_TYPE)
 		STRING(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER)
@@ -127,7 +126,7 @@
 	ENDIF(XPM_FOUND)
 
 	IF(JPEG_FOUND)
-		INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR})
+		INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR})
 		SET(HAVE_LIBJPEG 1)
 	ENDIF(JPEG_FOUND)
 
@@ -160,9 +159,9 @@
 		if(NOT MINGW AND MSVC_VERSION GREATER 1399)
 			ADD_DEFINITIONS("/D_CRT_SECURE_NO_DEPRECATE")
 		endif(NOT MINGW AND MSVC_VERSION GREATER 1399)
-		if (MINGW)
+		if (MINGW OR MSYS)
 			ADD_DEFINITIONS("-mms-bitfields -m32")
-		endif (MINGW)
+		endif (MINGW OR MSYS)
 	else (WIN32)
 		SET(GD_LIB gd)
 	endif (WIN32)