cvs: gd /libgd/cmake/modules FindFontconfig.cmake FindFreetype.cmake FindGD.cmake FindPNG.cmake FindPTHREAD.cmake FindXPM.cmake

pajoye		Thu Jan 25 00:08:59 2007 UTC

  Modified files:              
    /gd/libgd/cmake/modules	FindFontconfig.cmake FindFreetype.cmake 
                           	FindGD.cmake FindPNG.cmake 
                           	FindPTHREAD.cmake FindXPM.cmake 
  Log:
  - add lib64 tests (Chritian Rodriguez)
  
http://cvs.php.net/viewvc.cgi/gd/libgd/cmake/modules/FindFontconfig.cmake?r1=1.1&r2=1.2&diff_format=u
Index: gd/libgd/cmake/modules/FindFontconfig.cmake
diff -u gd/libgd/cmake/modules/FindFontconfig.cmake:1.1 gd/libgd/cmake/modules/FindFontconfig.cmake:1.2
--- gd/libgd/cmake/modules/FindFontconfig.cmake:1.1	Wed Jan 24 22:20:28 2007
+++ gd/libgd/cmake/modules/FindFontconfig.cmake	Thu Jan 25 00:08:59 2007
@@ -37,6 +37,7 @@
   find_library(FONTCONFIG_LIBRARIES NAMES fontconfig
     PATHS
     ${_FONTCONFIGLinkDir}
+	/usr/lib64
     /usr/lib
     /usr/local/lib
   )
http://cvs.php.net/viewvc.cgi/gd/libgd/cmake/modules/FindFreetype.cmake?r1=1.1&r2=1.2&diff_format=u
Index: gd/libgd/cmake/modules/FindFreetype.cmake
diff -u gd/libgd/cmake/modules/FindFreetype.cmake:1.1 gd/libgd/cmake/modules/FindFreetype.cmake:1.2
--- gd/libgd/cmake/modules/FindFreetype.cmake:1.1	Wed Jan 24 22:20:28 2007
+++ gd/libgd/cmake/modules/FindFreetype.cmake	Thu Jan 25 00:08:59 2007
@@ -21,6 +21,7 @@
 )
 
 FIND_LIBRARY(FREETYPE_LIBRARY freetype
+  /usr/lib64
   /usr/lib
   /usr/local/lib
 )
http://cvs.php.net/viewvc.cgi/gd/libgd/cmake/modules/FindGD.cmake?r1=1.1&r2=1.2&diff_format=u
Index: gd/libgd/cmake/modules/FindGD.cmake
diff -u gd/libgd/cmake/modules/FindGD.cmake:1.1 gd/libgd/cmake/modules/FindGD.cmake:1.2
--- gd/libgd/cmake/modules/FindGD.cmake:1.1	Wed Jan 24 22:20:28 2007
+++ gd/libgd/cmake/modules/FindGD.cmake	Thu Jan 25 00:08:59 2007
@@ -22,7 +22,7 @@
 
 FIND_LIBRARY(GD_LIBRARY
   NAMES ${GD_NAMES}
-  PATHS /usr/lib /usr/local/lib
+  PATHS /usr/lib64 /usr/lib /usr/local/lib
   )
 
 IF (GD_LIBRARY AND GD_INCLUDE_DIR)
http://cvs.php.net/viewvc.cgi/gd/libgd/cmake/modules/FindPNG.cmake?r1=1.1&r2=1.2&diff_format=u
Index: gd/libgd/cmake/modules/FindPNG.cmake
diff -u gd/libgd/cmake/modules/FindPNG.cmake:1.1 gd/libgd/cmake/modules/FindPNG.cmake:1.2
--- gd/libgd/cmake/modules/FindPNG.cmake:1.1	Wed Jan 24 22:20:28 2007
+++ gd/libgd/cmake/modules/FindPNG.cmake	Thu Jan 25 00:08:59 2007
@@ -29,7 +29,7 @@
   SET(PNG_NAMES ${PNG_NAMES} png libpng)
   FIND_LIBRARY(PNG_LIBRARY
     NAMES ${PNG_NAMES}
-    PATHS /usr/lib /usr/local/lib
+    PATHS /usr/lib64 /usr/lib /usr/local/lib
   )
 
   IF (PNG_LIBRARY AND PNG_PNG_INCLUDE_DIR)
http://cvs.php.net/viewvc.cgi/gd/libgd/cmake/modules/FindPTHREAD.cmake?r1=1.1&r2=1.2&diff_format=u
Index: gd/libgd/cmake/modules/FindPTHREAD.cmake
diff -u gd/libgd/cmake/modules/FindPTHREAD.cmake:1.1 gd/libgd/cmake/modules/FindPTHREAD.cmake:1.2
--- gd/libgd/cmake/modules/FindPTHREAD.cmake:1.1	Wed Jan 24 22:20:28 2007
+++ gd/libgd/cmake/modules/FindPTHREAD.cmake	Thu Jan 25 00:08:59 2007
@@ -1,6 +1,6 @@
 #############################################################################
 #
-# $Id: FindPTHREAD.cmake,v 1.1 2007/01/24 22:20:28 pajoye Exp $
+# $Id: FindPTHREAD.cmake,v 1.2 2007/01/25 00:08:59 pajoye Exp $
 #
 # Copyright (C) 1998-2006 Inria. All rights reserved.
 #
@@ -54,9 +54,11 @@
   FIND_LIBRARY(PTHREAD_LIBRARY
     NAMES pthread pthreadGC2 pthreadVSE pthreadGCE pthreadGC pthreadVC1 pthreadVC2
     PATHS
+    /usr/lib64
     /usr/lib
     /usr/local/lib
     /lib
+    /lib64
     $ENV{PTHREAD_LIBRARY_PATH}
     )
 
http://cvs.php.net/viewvc.cgi/gd/libgd/cmake/modules/FindXPM.cmake?r1=1.1&r2=1.2&diff_format=u
Index: gd/libgd/cmake/modules/FindXPM.cmake
diff -u gd/libgd/cmake/modules/FindXPM.cmake:1.1 gd/libgd/cmake/modules/FindXPM.cmake:1.2
--- gd/libgd/cmake/modules/FindXPM.cmake:1.1	Wed Jan 24 22:20:28 2007
+++ gd/libgd/cmake/modules/FindXPM.cmake	Thu Jan 25 00:08:59 2007
@@ -27,7 +27,7 @@
 SET(XPM_NAMES ${XPM_NAMES} Xpm libXpm)
 FIND_LIBRARY(XPM_LIBRARY
  NAMES ${XPM_NAMES}
- PATHS /usr/lib /usr/local/lib
+ PATHS /usr/lib64 /usr/lib /usr/local/lib
 )
 
 IF (XPM_LIBRARY AND XPM_XPM_INCLUDE_DIR)