cvs: gd /libgd CMakeLists.txt /libgd/src CMakeLists.txt

pajoye		Thu Oct  4 11:46:36 2007 UTC

  Modified files:              
    /gd/libgd	CMakeLists.txt 
    /gd/libgd/src	CMakeLists.txt 
  Log:
  - now it builds (tests to come)
  
  
http://cvs.php.net/viewvc.cgi/gd/libgd/CMakeLists.txt?r1=1.1&r2=1.2&diff_format=u
Index: gd/libgd/CMakeLists.txt
diff -u gd/libgd/CMakeLists.txt:1.1 gd/libgd/CMakeLists.txt:1.2
--- gd/libgd/CMakeLists.txt:1.1	Thu Oct  4 11:21:29 2007
+++ gd/libgd/CMakeLists.txt	Thu Oct  4 11:46:35 2007
@@ -94,61 +94,11 @@
 
 	ADD_DEFINITIONS(-DHAVE_CONFIG_H)
 
-	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
-		gd.c
-		gdfx.c
-		gd_security.c
-		gd_gd.c
-		gd_gd2.c
-		gd_io.c
-		gd_io_dp.c
-		gd_gif_in.c
-		gd_gif_out.c
-		gd_io_file.c
-		gd_io_ss.c
-		gd_jpeg.c
-		gd_png.c
-		gd_ss.c
-		gd_topal.c
-		gd_wbmp.c
-		gdcache.c
-		gdfontg.c
-		gdfontl.c
-		gdfontmb.c
-		gdfonts.c
-		gdfontt.c
-		gdft.c
-		gdhelpers.c
-		gdhelpers.h
-		gdkanji.c
-		gdtables.c
-		gdxpm.c
-		jisx0208.h
-		wbmp.c
-		wbmp.h
-	)
-
-	set(BUILD_SHARED_LIBS On)
-
-	if (WIN32)
-		SET(GD_LIB bgd)
-		ADD_DEFINITIONS( -DWIN32 -D_WIN32 -DMSWIN32 -DBGDWIN32)
-	else(WIN32)
-		SET(GD_LIB gd)
-	endif(WIN32)
-
-	add_library(${GD_LIB} ${LIBGD_SRC_FILES})
 
-	if (WIN32)
-		SET_TARGET_PROPERTIES(${GD_LIB} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:msvcrt.lib")
-	ENDIF(WIN32)
-
-	target_link_libraries(${GD_LIB} ${FREETYPE_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${XPM_LIBRARIES} ${FONTCONFIG_LIBRARIES})
+	
+	CONFIGURE_FILE(${GD_SOURCE_DIR}/src/config.h.cmake ${CMAKE_BINARY_DIR}/config.h ESCAPE_QUOTES)
+	add_subdirectory(src)
 
 endif (USE_EXT_GD)
-
 add_subdirectory(tests)
+
http://cvs.php.net/viewvc.cgi/gd/libgd/src/CMakeLists.txt?r1=1.6&r2=1.7&diff_format=u
Index: gd/libgd/src/CMakeLists.txt
diff -u /dev/null gd/libgd/src/CMakeLists.txt:1.7
--- /dev/null	Thu Oct  4 11:46:36 2007
+++ gd/libgd/src/CMakeLists.txt	Thu Oct  4 11:46:36 2007
@@ -0,0 +1,55 @@
+
+SET (LIBGD_SRC_FILES
+	gd.c
+	gdfx.c
+	gd_security.c
+	gd_gd.c
+	gd_gd2.c
+	gd_io.c
+	gd_io_dp.c
+	gd_gif_in.c
+	gd_gif_out.c
+	gd_io_file.c
+	gd_io_ss.c
+	gd_jpeg.c
+	gd_png.c
+	gd_ss.c
+	gd_topal.c
+	gd_wbmp.c
+	gdcache.c
+	gdfontg.c
+	gdfontl.c
+	gdfontmb.c
+	gdfonts.c
+	gdfontt.c
+	gdft.c
+	gdhelpers.c
+	gdhelpers.h
+	gdkanji.c
+	gdtables.c
+	gdxpm.c
+	jisx0208.h
+	wbmp.c
+	wbmp.h
+)
+
+set(BUILD_SHARED_LIBS On)
+
+if (WIN32)
+	SET(GD_LIB bgd)
+	ADD_DEFINITIONS( -DWIN32 -D_WIN32 -DMSWIN32 -DBGDWIN32)
+else(WIN32)
+	SET(GD_LIB gd)
+endif(WIN32)
+
+add_library(${GD_LIB} ${LIBGD_SRC_FILES})
+
+if (WIN32)
+	SET_TARGET_PROPERTIES(${GD_LIB} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:msvcrt.lib")
+ENDIF(WIN32)
+
+INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/  ${GD_SOURCE_DIR}/src)
+
+target_link_libraries(${GD_LIB} ${FREETYPE_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${XPM_LIBRARIES} ${FONTCONFIG_LIBRARIES})
+
+