cvs: gd /libgd CMakeLists.txt /libgd/cmake/modules FindFreetype.cmake /libgd/tests CMakeLists.txt

[email protected] ("Pierre-Alain Joye") Sun, 20 Apr 2008 12:30:16 -0000
Newsgroups php.gd.cvs
Message-ID <cvspajoye1208694616@cvsserver>
pajoye		Sun Apr 20 12:30:16 2008 UTC

  Modified files:              
    /gd/libgd	CMakeLists.txt 
    /gd/libgd/cmake/modules	FindFreetype.cmake 
    /gd/libgd/tests	CMakeLists.txt 
  Log:
  - gdTest link is also required on *nix
  - remove useless message- gdTest link is also required on *nix
  - remove useless messagess
  
  
http://cvs.php.net/viewvc.cgi/gd/libgd/CMakeLists.txt?r1=1.18&r2=1.19&diff_format=u
Index: gd/libgd/CMakeLists.txt
diff -u gd/libgd/CMakeLists.txt:1.18 gd/libgd/CMakeLists.txt:1.19
--- gd/libgd/CMakeLists.txt:1.18	Sat Apr 19 10:34:45 2008
+++ gd/libgd/CMakeLists.txt	Sun Apr 20 12:30:16 2008
@@ -1,4 +1,4 @@
-# $Id: CMakeLists.txt,v 1.18 2008/04/19 10:34:45 pajoye Exp $
+# $Id: CMakeLists.txt,v 1.19 2008/04/20 12:30:16 pajoye Exp $
 
 SET(PACKAGE GD)
 SET(PACKAGE_NAME GD)
@@ -108,7 +108,6 @@
 		INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIR})
 		SET(HAVE_FT2BUILD_H 1)
 		SET(HAVE_LIBFREETYPE 1)
-		MESSAGE("Freetype found******************************")
 	ENDIF(FREETYPE_FOUND)
 
 	IF(ZLIB_FOUND)
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	Thu Oct  4 11:21:29 2007
+++ gd/libgd/cmake/modules/FindFreetype.cmake	Sun Apr 20 12:30:16 2008
@@ -26,7 +26,7 @@
   /usr/lib
   /usr/local/lib
 )
-MESSAGE("FT2 lib found: " ${FREETYPE_LIBRARY})
+
 IF (FREETYPE_LIBRARY)
   IF (FREETYPE_INCLUDE_DIR_FTHEADER AND FREETYPE_INCLUDE_DIR_FT2BUILD)
     SET( FREETYPE_FOUND "YES" )
@@ -40,4 +40,4 @@
 MARK_AS_ADVANCED(
   FREETYPE_INCLUDE_DIR_FT2BUILD
   FREETYPE_INCLUDE_DIR_FTHEADER
-  )
\ No newline at end of file
+  )
http://cvs.php.net/viewvc.cgi/gd/libgd/tests/CMakeLists.txt?r1=1.4&r2=1.5&diff_format=u
Index: gd/libgd/tests/CMakeLists.txt
diff -u gd/libgd/tests/CMakeLists.txt:1.4 gd/libgd/tests/CMakeLists.txt:1.5
--- gd/libgd/tests/CMakeLists.txt:1.4	Fri Apr 18 14:32:09 2008
+++ gd/libgd/tests/CMakeLists.txt	Sun Apr 20 12:30:16 2008
@@ -56,7 +56,7 @@
 	IF (WIN32)
 		SET(GDTESTS_TARGET_LINK "gdTest")
 	ELSE (WIN32)
-		SET(GDTESTS_TARGET_LINK "")
+		SET(GDTESTS_TARGET_LINK "gdTest")
 	ENDIF (WIN32)
 
 	FOREACH(test_dir ${TESTS_DIRS})