cvs: gd /libgd CMakeLists.txt

[email protected] ("Pierre-Alain Joye") Tue, 01 Jan 2008 15:32:42 -0000
Newsgroups php.gd.cvs
Message-ID <cvspajoye1199201562@cvsserver>
pajoye		Tue Jan  1 15:32:42 2008 UTC

  Modified files:              
    /gd/libgd	CMakeLists.txt 
  Log:
  - disable fontconfig for now on windows default build
  
http://cvs.php.net/viewvc.cgi/gd/libgd/CMakeLists.txt?r1=1.11&r2=1.12&diff_format=u
Index: gd/libgd/CMakeLists.txt
diff -u gd/libgd/CMakeLists.txt:1.11 gd/libgd/CMakeLists.txt:1.12
--- gd/libgd/CMakeLists.txt:1.11	Fri Dec 28 16:47:52 2007
+++ gd/libgd/CMakeLists.txt	Tue Jan  1 15:32:42 2008
@@ -1,4 +1,4 @@
-# $Id: CMakeLists.txt,v 1.11 2007/12/28 16:47:52 pajoye Exp $
+# $Id: CMakeLists.txt,v 1.12 2008/01/01 15:32:42 pajoye Exp $
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4.3 FATAL_ERROR)
 PROJECT(GD)
@@ -84,7 +84,8 @@
 ENDIF (NOT WIN32)
 	FIND_PACKAGE(Freetype)
 	FIND_PACKAGE(XPM)
-	FIND_PACKAGE(Fontconfig)
+
+#	FIND_PACKAGE(Fontconfig)
 
 	if (FREETYPE_FOUND)
 		INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIR})
@@ -123,6 +124,8 @@
 		SET(HAVE_LIBFONTCONFIG 1)
 	ELSE (FONTCONFIG_FOUND)
 		SET(FONTCONFIG_LIBRARIES "")
+		SET(FONTCONFIG_INCLUDE_DIR "")
+		SET(FONTCONFIG_LIB_DIR "")
 	ENDIF(FONTCONFIG_FOUND)
 
 	SET(HAVE_CONFIG_H 1)