cvs: gd /libgd/tests CMakeLists.txt /libgd/tests/freetype CMakeLists.txt bug00132.c /libgd/tests/gd2 CMakeLists.txt /libgd/tests/gdimagearc CMakeLists.txt /libgd/tests/gdimagecolorclosest CMakeLists.txt /libgd/tests/gdimagecolordeallocate CMakeLists.txt /libgd/tests/gdimagecolorexact CMakeLists.txt /libgd/tests/gdimagecolorresolve CMakeLists.txt /libgd/tests/gdimagecolortransparent CMakeLists.txt /libgd/tests/gdimagecopy CMakeLists.txt /libgd/tests/gdimagecopyrotated CMakeLists.txt /libgd/tests/gdimagefill CMakeLists.txt /libgd/tests/gdimagefilledellipse CMakeLists.txt /libgd/tests/gdimagefilledrectangle CMakeLists.txt /libgd/tests/gdimagefilltoborder CMakeLists.txt /libgd/tests/gdimageline CMakeLists.txt /libgd/tests/gdimagerectangle CMakeLists.txt /libgd/tests/gdtest CMakeLists.txt /libgd/tests/gdtiled CMakeLists.txt /libgd/tests/gif CMakeLists.txt /libgd/tests/jpeg CMakeLists.txt /libgd/tests/png CMakeLists.txt

[email protected] ("Pierre-Alain Joye") Fri, 18 Apr 2008 14:32:10 -0000

Newsgroups	php.gd.cvs
Message-ID	<cvspajoye1208529130@cvsserver>

pajoye		Fri Apr 18 14:32:10 2008 UTC

  Modified files:              
    /gd/libgd/tests	CMakeLists.txt 
    /gd/libgd/tests/freetype	CMakeLists.txt bug00132.c 
    /gd/libgd/tests/gd2	CMakeLists.txt 
    /gd/libgd/tests/gdimagearc	CMakeLists.txt 
    /gd/libgd/tests/gdimagecolorclosest	CMakeLists.txt 
    /gd/libgd/tests/gdimagecolordeallocate	CMakeLists.txt 
    /gd/libgd/tests/gdimagecolorexact	CMakeLists.txt 
    /gd/libgd/tests/gdimagecolorresolve	CMakeLists.txt 
    /gd/libgd/tests/gdimagecolortransparent	CMakeLists.txt 
    /gd/libgd/tests/gdimagecopy	CMakeLists.txt 
    /gd/libgd/tests/gdimagecopyrotated	CMakeLists.txt 
    /gd/libgd/tests/gdimagefill	CMakeLists.txt 
    /gd/libgd/tests/gdimagefilledellipse	CMakeLists.txt 
    /gd/libgd/tests/gdimagefilledrectangle	CMakeLists.txt 
    /gd/libgd/tests/gdimagefilltoborder	CMakeLists.txt 
    /gd/libgd/tests/gdimageline	CMakeLists.txt 
    /gd/libgd/tests/gdimagerectangle	CMakeLists.txt 
    /gd/libgd/tests/gdtest	CMakeLists.txt 
    /gd/libgd/tests/gdtiled	CMakeLists.txt 
    /gd/libgd/tests/gif	CMakeLists.txt 
    /gd/libgd/tests/jpeg	CMakeLists.txt 
    /gd/libgd/tests/png	CMakeLists.txt 
  Log:
  - fix tests running under MinGW
    - jpeg and freetpye (2.3.5) compiled under mingw seems to behaves differently. 
      jpeg_read and freetype/bug00132 tests fail. I will have to investigate later

pajoye-20080418143210.txt (text/plain, 16.8 KB)

http://cvs.php.net/viewvc.cgi/gd/libgd/tests/CMakeLists.txt?r1=1.3&r2=1.4&diff_format=u
Index: gd/libgd/tests/CMakeLists.txt
diff -u gd/libgd/tests/CMakeLists.txt:1.3 gd/libgd/tests/CMakeLists.txt:1.4
--- gd/libgd/tests/CMakeLists.txt:1.3	Wed Nov 21 09:09:19 2007
+++ gd/libgd/tests/CMakeLists.txt	Fri Apr 18 14:32:09 2008
@@ -28,7 +28,6 @@
 
 	include_directories (BEFORE ${GD_INCLUDE_DIR} "${GDTEST_SOURCE_DIR}" "${CMAKE_BINARY_DIR}")
 
-
 	SET(TESTS_DIRS
 		gdtest
 		gdimagearc
@@ -54,7 +53,14 @@
 		freetype
 	)
 
+	IF (WIN32)
+		SET(GDTESTS_TARGET_LINK "gdTest")
+	ELSE (WIN32)
+		SET(GDTESTS_TARGET_LINK "")
+	ENDIF (WIN32)
+
 	FOREACH(test_dir ${TESTS_DIRS})
 		add_subdirectory (${test_dir})
 	ENDFOREACH(test_dir)
+
 endif (BUILD_TEST)
http://cvs.php.net/viewvc.cgi/gd/libgd/tests/freetype/CMakeLists.txt?r1=1.1&r2=1.2&diff_format=u
Index: gd/libgd/tests/freetype/CMakeLists.txt
diff -u gd/libgd/tests/freetype/CMakeLists.txt:1.1 gd/libgd/tests/freetype/CMakeLists.txt:1.2
--- gd/libgd/tests/freetype/CMakeLists.txt:1.1	Wed Nov 21 09:09:19 2007
+++ gd/libgd/tests/freetype/CMakeLists.txt	Fri Apr 18 14:32:09 2008
@@ -4,6 +4,6 @@
 
 FOREACH(test_name ${TESTS_FILES})
 	add_executable(${test_name} "${test_name}.c")
-	target_link_libraries (${test_name} gdTest ${GD_LIB})
+	target_link_libraries (${test_name} ${GDTESTS_TARGET_LINK})
 	ADD_TEST(${test_name} ${EXECUTABLE_OUTPUT_PATH}/${test_name})
 ENDFOREACH(test_name)
http://cvs.php.net/viewvc.cgi/gd/libgd/tests/freetype/bug00132.c?r1=1.3&r2=1.4&diff_format=u
Index: gd/libgd/tests/freetype/bug00132.c
diff -u gd/libgd/tests/freetype/bug00132.c:1.3 gd/libgd/tests/freetype/bug00132.c:1.4
--- gd/libgd/tests/freetype/bug00132.c:1.3	Wed Nov 21 21:09:55 2007
+++ gd/libgd/tests/freetype/bug00132.c	Fri Apr 18 14:32:09 2008
@@ -1,9 +1,10 @@
-/* $Id: bug00132.c,v 1.3 2007/11/21 21:09:55 pajoye Exp $ */
+/* $Id: bug00132.c,v 1.4 2008/04/18 14:32:09 pajoye Exp $ */
 
 #include "gd.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include "gdtest.h"
+#include "gdfontl.h"
 
 int main()
 {
@@ -13,6 +14,7 @@
 	const char *file_exp = "bug00132_exp.png";
 
 	im = gdImageCreateTrueColor(50, 30);
+
 	if (!im) {
 		printf("can't get truecolor image\n");
 		return 1;
@@ -22,15 +24,16 @@
 	gdImageFilledRectangle(im, 0, 0, 200, 200, gdTrueColorAlpha(0, 0, 0, 127));
 
 	sprintf(path, "%s/freetype/DejaVuSans.ttf", GDTEST_TOP_DIR);
-	gdImageStringFT(im, NULL,  0xFFFFFF, path, 14.0, 0.0, 10, 20, "&thetasym; &theta;");
+	gdImageStringFT(im, NULL,  0xFFFFFF, path, 14.0, 0.0, 20, 20, "AAA&thetasym; &theta;");
 
 	sprintf(path, "%s/freetype/%s", GDTEST_TOP_DIR, file_exp);
 	if (!gdAssertImageEqualsToFile(path, im)) {
 		error = 1;
 		printf("Reference image and destination differ\n");
+	} else {
+
 	}
 
 	gdImageDestroy(im);
-
 	return error;
 }
http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gd2/CMakeLists.txt?r1=1.1&r2=1.2&diff_format=u
Index: gd/libgd/tests/gd2/CMakeLists.txt
diff -u gd/libgd/tests/gd2/CMakeLists.txt:1.1 gd/libgd/tests/gd2/CMakeLists.txt:1.2
--- gd/libgd/tests/gd2/CMakeLists.txt:1.1	Tue Oct  2 09:01:52 2007
+++ gd/libgd/tests/gd2/CMakeLists.txt	Fri Apr 18 14:32:09 2008
@@ -6,6 +6,6 @@
 
 FOREACH(test_name ${TESTS_FILES})
 	add_executable(${test_name} "${test_name}.c")
-	target_link_libraries (${test_name} gdTest ${GD_LIB})
+	target_link_libraries (${test_name} gdTest ${GDTESTS_TARGET_LINK})
 	ADD_TEST(${test_name} ${EXECUTABLE_OUTPUT_PATH}/${test_name})
 ENDFOREACH(test_name)
http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gdimagearc/CMakeLists.txt?r1=1.1&r2=1.2&diff_format=u
Index: gd/libgd/tests/gdimagearc/CMakeLists.txt
diff -u gd/libgd/tests/gdimagearc/CMakeLists.txt:1.1 gd/libgd/tests/gdimagearc/CMakeLists.txt:1.2
--- gd/libgd/tests/gdimagearc/CMakeLists.txt:1.1	Tue Oct  2 09:01:52 2007
+++ gd/libgd/tests/gdimagearc/CMakeLists.txt	Fri Apr 18 14:32:09 2008
@@ -4,6 +4,6 @@
 
 FOREACH(test_name ${TESTS_FILES})
 	add_executable(${test_name} "${test_name}.c")
-	target_link_libraries (${test_name} gdTest ${GD_LIB})
+	target_link_libraries (${test_name} ${GDTESTS_TARGET_LINK})
 	ADD_TEST(${test_name} ${EXECUTABLE_OUTPUT_PATH}/${test_name})
 ENDFOREACH(test_name)
http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gdimagecolorclosest/CMakeLists.txt?r1=1.1&r2=1.2&diff_format=u
Index: gd/libgd/tests/gdimagecolorclosest/CMakeLists.txt
diff -u gd/libgd/tests/gdimagecolorclosest/CMakeLists.txt:1.1 gd/libgd/tests/gdimagecolorclosest/CMakeLists.txt:1.2
--- gd/libgd/tests/gdimagecolorclosest/CMakeLists.txt:1.1	Tue Oct  2 09:01:52 2007
+++ gd/libgd/tests/gdimagecolorclosest/CMakeLists.txt	Fri Apr 18 14:32:09 2008
@@ -4,6 +4,6 @@
 
 FOREACH(test_name ${TESTS_FILES})
 	add_executable(${test_name} "${test_name}.c")
-	target_link_libraries (${test_name} gdTest ${GD_LIB})
+	target_link_libraries (${test_name} ${GDTESTS_TARGET_LINK})
 	ADD_TEST("${test_name}" ${EXECUTABLE_OUTPUT_PATH}/${test_name})
 ENDFOREACH(test_name)
http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gdimagecolordeallocate/CMakeLists.txt?r1=1.1&r2=1.2&diff_format=u
Index: gd/libgd/tests/gdimagecolordeallocate/CMakeLists.txt
diff -u gd/libgd/tests/gdimagecolordeallocate/CMakeLists.txt:1.1 gd/libgd/tests/gdimagecolordeallocate/CMakeLists.txt:1.2
--- gd/libgd/tests/gdimagecolordeallocate/CMakeLists.txt:1.1	Tue Oct  2 09:01:52 2007
+++ gd/libgd/tests/gdimagecolordeallocate/CMakeLists.txt	Fri Apr 18 14:32:09 2008
@@ -4,6 +4,6 @@
 
 FOREACH(test_name ${TESTS_FILES})
 	add_executable(${test_name} "${test_name}.c")
-	target_link_libraries (${test_name} gdTest ${GD_LIB})
+	target_link_libraries (${test_name} ${GDTESTS_TARGET_LINK})
 	ADD_TEST("${test_name}" ${EXECUTABLE_OUTPUT_PATH}/${test_name})
 ENDFOREACH(test_name)
http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gdimagecolorexact/CMakeLists.txt?r1=1.1&r2=1.2&diff_format=u
Index: gd/libgd/tests/gdimagecolorexact/CMakeLists.txt
diff -u gd/libgd/tests/gdimagecolorexact/CMakeLists.txt:1.1 gd/libgd/tests/gdimagecolorexact/CMakeLists.txt:1.2
--- gd/libgd/tests/gdimagecolorexact/CMakeLists.txt:1.1	Tue Oct  2 09:01:52 2007
+++ gd/libgd/tests/gdimagecolorexact/CMakeLists.txt	Fri Apr 18 14:32:09 2008
@@ -4,6 +4,6 @@
 
 FOREACH(test_name ${TESTS_FILES})
 	add_executable(${test_name} "${test_name}.c")
-	target_link_libraries (${test_name} gdTest ${GD_LIB})
+	target_link_libraries (${test_name} gdTest ${GDTESTS_TARGET_LINK})
 	ADD_TEST("${test_name}" ${EXECUTABLE_OUTPUT_PATH}/${test_name})
 ENDFOREACH(test_name)
http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gdimagecolorresolve/CMakeLists.txt?r1=1.1&r2=1.2&diff_format=u
Index: gd/libgd/tests/gdimagecolorresolve/CMakeLists.txt
diff -u gd/libgd/tests/gdimagecolorresolve/CMakeLists.txt:1.1 gd/libgd/tests/gdimagecolorresolve/CMakeLists.txt:1.2
--- gd/libgd/tests/gdimagecolorresolve/CMakeLists.txt:1.1	Tue Oct  2 09:01:52 2007
+++ gd/libgd/tests/gdimagecolorresolve/CMakeLists.txt	Fri Apr 18 14:32:09 2008
@@ -4,6 +4,6 @@
 
 FOREACH(test_name ${TESTS_FILES})
 	add_executable(${test_name} "${test_name}.c")
-	target_link_libraries (${test_name} gdTest ${GD_LIB})
+	target_link_libraries (${test_name} gdTest ${GDTESTS_TARGET_LINK})
 	ADD_TEST("${test_name}" ${EXECUTABLE_OUTPUT_PATH}/${test_name})
 ENDFOREACH(test_name)
http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gdimagecolortransparent/CMakeLists.txt?r1=1.1&r2=1.2&diff_format=u
Index: gd/libgd/tests/gdimagecolortransparent/CMakeLists.txt
diff -u gd/libgd/tests/gdimagecolortransparent/CMakeLists.txt:1.1 gd/libgd/tests/gdimagecolortransparent/CMakeLists.txt:1.2
--- gd/libgd/tests/gdimagecolortransparent/CMakeLists.txt:1.1	Tue Oct  2 09:01:52 2007
+++ gd/libgd/tests/gdimagecolortransparent/CMakeLists.txt	Fri Apr 18 14:32:09 2008
@@ -4,6 +4,6 @@
 
 FOREACH(test_name ${TESTS_FILES})
 	add_executable(${test_name} "${test_name}.c")
-	target_link_libraries (${test_name} gdTest ${GD_LIB})
+	target_link_libraries (${test_name} gdTest ${GDTESTS_TARGET_LINK})
 	ADD_TEST("${test_name}" ${EXECUTABLE_OUTPUT_PATH}/${test_name})
 ENDFOREACH(test_name)
http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gdimagecopy/CMakeLists.txt?r1=1.2&r2=1.3&diff_format=u
Index: gd/libgd/tests/gdimagecopy/CMakeLists.txt
diff -u gd/libgd/tests/gdimagecopy/CMakeLists.txt:1.2 gd/libgd/tests/gdimagecopy/CMakeLists.txt:1.3
--- gd/libgd/tests/gdimagecopy/CMakeLists.txt:1.2	Wed Nov 21 00:32:55 2007
+++ gd/libgd/tests/gdimagecopy/CMakeLists.txt	Fri Apr 18 14:32:09 2008
@@ -5,6 +5,6 @@
 
 FOREACH(test_name ${TESTS_FILES})
 	add_executable(${test_name} "${test_name}.c")
-	target_link_libraries (${test_name} gdTest ${GD_LIB})
+	target_link_libraries (${test_name} ${GDTESTS_TARGET_LINK})
 	ADD_TEST(${test_name} ${EXECUTABLE_OUTPUT_PATH}/${test_name})
 ENDFOREACH(test_name)
http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gdimagecopyrotated/CMakeLists.txt?r1=1.1&r2=1.2&diff_format=u
Index: gd/libgd/tests/gdimagecopyrotated/CMakeLists.txt
diff -u gd/libgd/tests/gdimagecopyrotated/CMakeLists.txt:1.1 gd/libgd/tests/gdimagecopyrotated/CMakeLists.txt:1.2
--- gd/libgd/tests/gdimagecopyrotated/CMakeLists.txt:1.1	Tue Oct  2 09:01:52 2007
+++ gd/libgd/tests/gdimagecopyrotated/CMakeLists.txt	Fri Apr 18 14:32:09 2008
@@ -5,6 +5,6 @@
 
 FOREACH(test_name ${TESTS_FILES})
 	add_executable(${test_name} "${test_name}.c")
-	target_link_libraries (${test_name} gdTest ${GD_LIB})
+	target_link_libraries (${test_name} gdTest ${GDTESTS_TARGET_LINK})
 	ADD_TEST(${test_name} ${EXECUTABLE_OUTPUT_PATH}/${test_name})
-ENDFOREACH(test_name)
\ No newline at end of file
+ENDFOREACH(test_name)
http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gdimagefill/CMakeLists.txt?r1=1.1&r2=1.2&diff_format=u
Index: gd/libgd/tests/gdimagefill/CMakeLists.txt
diff -u gd/libgd/tests/gdimagefill/CMakeLists.txt:1.1 gd/libgd/tests/gdimagefill/CMakeLists.txt:1.2
--- gd/libgd/tests/gdimagefill/CMakeLists.txt:1.1	Tue Oct  2 09:01:53 2007
+++ gd/libgd/tests/gdimagefill/CMakeLists.txt	Fri Apr 18 14:32:09 2008
@@ -7,6 +7,6 @@
 )
 FOREACH(test_name ${TESTS_FILES})
 	add_executable(${test_name} "${test_name}.c")
-	target_link_libraries (${test_name} gdTest ${GD_LIB})
+	target_link_libraries (${test_name} ${GDTESTS_TARGET_LINK})
 	ADD_TEST(${test_name} ${EXECUTABLE_OUTPUT_PATH}/${test_name})
-ENDFOREACH(test_name)
\ No newline at end of file
+ENDFOREACH(test_name)
http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gdimagefilledellipse/CMakeLists.txt?r1=1.1&r2=1.2&diff_format=u
Index: gd/libgd/tests/gdimagefilledellipse/CMakeLists.txt
diff -u gd/libgd/tests/gdimagefilledellipse/CMakeLists.txt:1.1 gd/libgd/tests/gdimagefilledellipse/CMakeLists.txt:1.2
--- gd/libgd/tests/gdimagefilledellipse/CMakeLists.txt:1.1	Tue Oct  2 09:01:53 2007
+++ gd/libgd/tests/gdimagefilledellipse/CMakeLists.txt	Fri Apr 18 14:32:09 2008
@@ -5,6 +5,6 @@
 
 FOREACH(test_name ${TESTS_FILES})
 	add_executable(${test_name} "${test_name}.c")
-	target_link_libraries (${test_name} gdTest ${GD_LIB})
+	target_link_libraries (${test_name} ${GDTESTS_TARGET_LINK})
 	ADD_TEST(${test_name} ${EXECUTABLE_OUTPUT_PATH}/${test_name})
-ENDFOREACH(test_name)
\ No newline at end of file
+ENDFOREACH(test_name)
http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gdimagefilledrectangle/CMakeLists.txt?r1=1.1&r2=1.2&diff_format=u
Index: gd/libgd/tests/gdimagefilledrectangle/CMakeLists.txt
diff -u gd/libgd/tests/gdimagefilledrectangle/CMakeLists.txt:1.1 gd/libgd/tests/gdimagefilledrectangle/CMakeLists.txt:1.2
--- gd/libgd/tests/gdimagefilledrectangle/CMakeLists.txt:1.1	Tue Oct  2 09:01:53 2007
+++ gd/libgd/tests/gdimagefilledrectangle/CMakeLists.txt	Fri Apr 18 14:32:09 2008
@@ -6,6 +6,6 @@
 
 FOREACH(test_name ${TESTS_FILES})
 	add_executable(${test_name} "${test_name}.c")
-	target_link_libraries (${test_name} gdTest ${GD_LIB})
+	target_link_libraries (${test_name} ${GDTESTS_TARGET_LINK})
 	ADD_TEST(${test_name} ${EXECUTABLE_OUTPUT_PATH}/${test_name})
 ENDFOREACH(test_name)
http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gdimagefilltoborder/CMakeLists.txt?r1=1.1&r2=1.2&diff_format=u
Index: gd/libgd/tests/gdimagefilltoborder/CMakeLists.txt
diff -u gd/libgd/tests/gdimagefilltoborder/CMakeLists.txt:1.1 gd/libgd/tests/gdimagefilltoborder/CMakeLists.txt:1.2
--- gd/libgd/tests/gdimagefilltoborder/CMakeLists.txt:1.1	Tue Oct  2 09:01:53 2007
+++ gd/libgd/tests/gdimagefilltoborder/CMakeLists.txt	Fri Apr 18 14:32:09 2008
@@ -4,6 +4,6 @@
 )
 FOREACH(test_name ${TESTS_FILES})
 	add_executable(${test_name} "${test_name}.c")
-	target_link_libraries (${test_name} gdTest ${GD_LIB})
+	target_link_libraries (${test_name} ${GDTESTS_TARGET_LINK})
 	ADD_TEST(${test_name} ${EXECUTABLE_OUTPUT_PATH}/${test_name})
-ENDFOREACH(test_name)
\ No newline at end of file
+ENDFOREACH(test_name)
http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gdimageline/CMakeLists.txt?r1=1.2&r2=1.3&diff_format=u
Index: gd/libgd/tests/gdimageline/CMakeLists.txt
diff -u gd/libgd/tests/gdimageline/CMakeLists.txt:1.2 gd/libgd/tests/gdimageline/CMakeLists.txt:1.3
--- gd/libgd/tests/gdimageline/CMakeLists.txt:1.2	Wed Nov 21 21:14:59 2007
+++ gd/libgd/tests/gdimageline/CMakeLists.txt	Fri Apr 18 14:32:09 2008
@@ -8,6 +8,6 @@
 
 FOREACH(test_name ${TESTS_FILES})
 	add_executable(${test_name} "${test_name}.c")
-	target_link_libraries (${test_name} gdTest ${GD_LIB})
+	target_link_libraries (${test_name} ${GDTESTS_TARGET_LINK})
 	ADD_TEST(${test_name} ${EXECUTABLE_OUTPUT_PATH}/${test_name})
 ENDFOREACH(test_name)
http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gdimagerectangle/CMakeLists.txt?r1=1.1&r2=1.2&diff_format=u
Index: gd/libgd/tests/gdimagerectangle/CMakeLists.txt
diff -u gd/libgd/tests/gdimagerectangle/CMakeLists.txt:1.1 gd/libgd/tests/gdimagerectangle/CMakeLists.txt:1.2
--- gd/libgd/tests/gdimagerectangle/CMakeLists.txt:1.1	Tue Oct  2 09:01:53 2007
+++ gd/libgd/tests/gdimagerectangle/CMakeLists.txt	Fri Apr 18 14:32:09 2008
@@ -5,6 +5,6 @@
 
 FOREACH(test_name ${TESTS_FILES})
 	add_executable(${test_name} "${test_name}.c")
-	target_link_libraries (${test_name} gdTest ${GD_LIB})
+	target_link_libraries (${test_name} ${GDTESTS_TARGET_LINK})
 	ADD_TEST(${test_name} ${EXECUTABLE_OUTPUT_PATH}/${test_name})
 ENDFOREACH(test_name)
http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gdtest/CMakeLists.txt?r1=1.2&r2=1.3&diff_format=u
Index: gd/libgd/tests/gdtest/CMakeLists.txt
diff -u gd/libgd/tests/gdtest/CMakeLists.txt:1.2 gd/libgd/tests/gdtest/CMakeLists.txt:1.3
--- gd/libgd/tests/gdtest/CMakeLists.txt:1.2	Fri Apr 18 13:36:17 2008
+++ gd/libgd/tests/gdtest/CMakeLists.txt	Fri Apr 18 14:32:09 2008
@@ -1,4 +1,4 @@
 SET(GDTEST_TOP_DIR "${GD_SOURCE_DIR}/tests")
 CONFIGURE_FILE(test_config.h.cmake test_config.h ESCAPE_QUOTES)
-add_library (gdTest gdtest.c)
-target_link_libraries(gdTest ${GD_LIB})
+add_library (gdTest STATIC gdtest.c)
+target_link_libraries(gdTest ${GD_LIB_STATIC})
http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gdtiled/CMakeLists.txt?r1=1.1&r2=1.2&diff_format=u
Index: gd/libgd/tests/gdtiled/CMakeLists.txt
diff -u gd/libgd/tests/gdtiled/CMakeLists.txt:1.1 gd/libgd/tests/gdtiled/CMakeLists.txt:1.2
--- gd/libgd/tests/gdtiled/CMakeLists.txt:1.1	Tue Oct  2 09:01:53 2007
+++ gd/libgd/tests/gdtiled/CMakeLists.txt	Fri Apr 18 14:32:09 2008
@@ -1,5 +1,5 @@
 add_executable(bug00032 bug00032.c)
 
-target_link_libraries (bug00032 gdTest ${GD_LIB})
+target_link_libraries (bug00032 ${GDTESTS_TARGET_LINK})
 
 ADD_TEST(bug00032 ${EXECUTABLE_OUTPUT_PATH}/bug00032)
http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gif/CMakeLists.txt?r1=1.1&r2=1.2&diff_format=u
Index: gd/libgd/tests/gif/CMakeLists.txt
diff -u gd/libgd/tests/gif/CMakeLists.txt:1.1 gd/libgd/tests/gif/CMakeLists.txt:1.2
--- gd/libgd/tests/gif/CMakeLists.txt:1.1	Tue Oct  2 09:01:53 2007
+++ gd/libgd/tests/gif/CMakeLists.txt	Fri Apr 18 14:32:09 2008
@@ -9,6 +9,6 @@
 
 FOREACH(test_name ${TESTS_FILES})
 	add_executable(${test_name} "${test_name}.c")
-	target_link_libraries (${test_name} gdTest ${GD_LIB})
+	target_link_libraries (${test_name} ${GDTESTS_TARGET_LINK})
 	ADD_TEST(${test_name} ${EXECUTABLE_OUTPUT_PATH}/${test_name})
 ENDFOREACH(test_name)
http://cvs.php.net/viewvc.cgi/gd/libgd/tests/jpeg/CMakeLists.txt?r1=1.1&r2=1.2&diff_format=u
Index: gd/libgd/tests/jpeg/CMakeLists.txt
diff -u gd/libgd/tests/jpeg/CMakeLists.txt:1.1 gd/libgd/tests/jpeg/CMakeLists.txt:1.2
--- gd/libgd/tests/jpeg/CMakeLists.txt:1.1	Tue Oct  2 09:01:53 2007
+++ gd/libgd/tests/jpeg/CMakeLists.txt	Fri Apr 18 14:32:10 2008
@@ -6,6 +6,6 @@
 
 FOREACH(test_name ${TESTS_FILES})
 	add_executable(${test_name} "${test_name}.c")
-	target_link_libraries (${test_name} gdTest ${GD_LIB})
+	target_link_libraries (${test_name} ${GDTESTS_TARGET_LINK})
 	ADD_TEST(${test_name} ${EXECUTABLE_OUTPUT_PATH}/${test_name})
 ENDFOREACH(test_name)
http://cvs.php.net/viewvc.cgi/gd/libgd/tests/png/CMakeLists.txt?r1=1.2&r2=1.3&diff_format=u
Index: gd/libgd/tests/png/CMakeLists.txt
diff -u gd/libgd/tests/png/CMakeLists.txt:1.2 gd/libgd/tests/png/CMakeLists.txt:1.3
--- gd/libgd/tests/png/CMakeLists.txt:1.2	Sun Nov 18 14:46:45 2007
+++ gd/libgd/tests/png/CMakeLists.txt	Fri Apr 18 14:32:10 2008
@@ -8,6 +8,6 @@
 
 FOREACH(test_name ${TESTS_FILES})
 	add_executable(${test_name} "${test_name}.c")
-	target_link_libraries (${test_name} gdTest ${GD_LIB})
+	target_link_libraries (${test_name} ${GDTESTS_TARGET_LINK})
 	ADD_TEST(${test_name} ${EXECUTABLE_OUTPUT_PATH}/${test_name})
 ENDFOREACH(test_name)