cvs: gd(GD_2_0) /libgd CMakeLists.txt /libgd/cmake/modules FindFreetype.cmake /libgd/tests/gdimagefilledrectangle CMakeLists.txt bug00078.c

pajoye		Sun May  6 20:13:38 2007 UTC

  Modified files:              (Branch: GD_2_0)
    /gd/libgd	CMakeLists.txt 
    /gd/libgd/cmake/modules	FindFreetype.cmake 
    /gd/libgd/tests/gdimagefilledrectangle	CMakeLists.txt bug00078.c 
  Log:
  - update cmake
   - remove strlcpy.c
   - fix HAVE_FREETYPE definitiion
  
  
http://cvs.php.net/viewvc.cgi/gd/libgd/CMakeLists.txt?r1=1.1.2.4&r2=1.1.2.5&diff_format=u
Index: gd/libgd/CMakeLists.txt
diff -u gd/libgd/CMakeLists.txt:1.1.2.4 gd/libgd/CMakeLists.txt:1.1.2.5
--- gd/libgd/CMakeLists.txt:1.1.2.4	Tue Apr 24 07:47:14 2007
+++ gd/libgd/CMakeLists.txt	Sun May  6 20:13:38 2007
@@ -42,7 +42,6 @@
 	include(CheckIncludeFiles)
 	include(CheckIncludeFile)
 
-
 	include(AC_HEADER_STDC)
 	include(CheckPrototypeExists)
 	SET(FONTCONFIG_FIND_QUIETLY, 1)
@@ -95,12 +94,9 @@
 
 	ADD_DEFINITIONS(-DHAVE_CONFIG_H)
 
-	IF (WIN32)
-
-	ENDIF (WIN32)
 
 	INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/  ${GD_SOURCE_DIR})
-	
+
 	CONFIGURE_FILE(${GD_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h ESCAPE_QUOTES)
 
 	SET (LIBGD_SRC_FILES
@@ -135,7 +131,6 @@
 		jisx0208.h
 		wbmp.c
 		wbmp.h
-		strlcpy.c
 	)
 
 	set(BUILD_SHARED_LIBS On)
http://cvs.php.net/viewvc.cgi/gd/libgd/cmake/modules/FindFreetype.cmake?r1=1.2&r2=1.2.2.1&diff_format=u
Index: gd/libgd/cmake/modules/FindFreetype.cmake
diff -u gd/libgd/cmake/modules/FindFreetype.cmake:1.2 gd/libgd/cmake/modules/FindFreetype.cmake:1.2.2.1
--- gd/libgd/cmake/modules/FindFreetype.cmake:1.2	Thu Jan 25 00:08:59 2007
+++ gd/libgd/cmake/modules/FindFreetype.cmake	Sun May  6 20:13:38 2007
@@ -39,4 +39,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/gdimagefilledrectangle/CMakeLists.txt?r1=1.1&r2=1.1.2.1&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.1.2.1
--- gd/libgd/tests/gdimagefilledrectangle/CMakeLists.txt:1.1	Tue Jan 23 23:57:54 2007
+++ gd/libgd/tests/gdimagefilledrectangle/CMakeLists.txt	Sun May  6 20:13:38 2007
@@ -1,4 +1,10 @@
+SET(TESTS_FILES
+	bug00004
+	bug00078
+)
 
-add_executable(bug00004 bug00004.c)
-target_link_libraries (bug00004 gdTest ${GD_LIB})
-ADD_TEST(bug00004 ${EXECUTABLE_OUTPUT_PATH}/bug00004)
+FOREACH(test_name ${TESTS_FILES})
+	add_executable(${test_name} "${test_name}.c")
+	target_link_libraries (${test_name} gdTest ${GD_LIB})
+	ADD_TEST(${test_name} ${EXECUTABLE_OUTPUT_PATH}/${test_name})
+ENDFOREACH(test_name)
http://cvs.php.net/viewvc.cgi/gd/libgd/tests/gdimagefilledrectangle/bug00078.c?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: gd/libgd/tests/gdimagefilledrectangle/bug00078.c
diff -u gd/libgd/tests/gdimagefilledrectangle/bug00078.c:1.1.2.1 gd/libgd/tests/gdimagefilledrectangle/bug00078.c:1.1.2.2
--- gd/libgd/tests/gdimagefilledrectangle/bug00078.c:1.1.2.1	Sun May  6 17:52:20 2007
+++ gd/libgd/tests/gdimagefilledrectangle/bug00078.c	Sun May  6 20:13:38 2007
@@ -31,6 +31,7 @@
 	 0x005e5e5e == c3 && 0x005e5e5e == c4)) {
 	 	return 1;
 	}
+
 	gdImageDestroy(im);
 	return 0;
 }