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

pajoye		Thu Oct  4 12:14:56 2007 UTC

  Modified files:              
    /gd/libgd	CMakeLists.txt 
    /gd/libgd/src	CMakeLists.txt 
    /gd/libgd/tests	CMakeLists.txt 
  Log:
  - CMake test should work now
  
  
http://cvs.php.net/viewvc.cgi/gd/libgd/CMakeLists.txt?r1=1.2&r2=1.3&diff_format=u
Index: gd/libgd/CMakeLists.txt
diff -u gd/libgd/CMakeLists.txt:1.2 gd/libgd/CMakeLists.txt:1.3
--- gd/libgd/CMakeLists.txt:1.2	Thu Oct  4 11:46:35 2007
+++ gd/libgd/CMakeLists.txt	Thu Oct  4 12:14:55 2007
@@ -93,12 +93,20 @@
 	SET(HAVE_CONFIG_H 1)
 
 	ADD_DEFINITIONS(-DHAVE_CONFIG_H)
-
-
 	
 	CONFIGURE_FILE(${GD_SOURCE_DIR}/src/config.h.cmake ${CMAKE_BINARY_DIR}/config.h ESCAPE_QUOTES)
-	add_subdirectory(src)
 
+	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_subdirectory(src)
+	message("GD_LIB Main: ${GD_LIB}")
 endif (USE_EXT_GD)
 add_subdirectory(tests)
 
http://cvs.php.net/viewvc.cgi/gd/libgd/src/CMakeLists.txt?r1=1.7&r2=1.8&diff_format=u
Index: gd/libgd/src/CMakeLists.txt
diff -u gd/libgd/src/CMakeLists.txt:1.7 gd/libgd/src/CMakeLists.txt:1.8
--- gd/libgd/src/CMakeLists.txt:1.7	Thu Oct  4 11:46:36 2007
+++ gd/libgd/src/CMakeLists.txt	Thu Oct  4 12:14:55 2007
@@ -33,15 +33,6 @@
 	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)
http://cvs.php.net/viewvc.cgi/gd/libgd/tests/CMakeLists.txt?r1=1.1&r2=1.2&diff_format=u
Index: gd/libgd/tests/CMakeLists.txt
diff -u gd/libgd/tests/CMakeLists.txt:1.1 gd/libgd/tests/CMakeLists.txt:1.2
--- gd/libgd/tests/CMakeLists.txt:1.1	Tue Oct  2 09:01:52 2007
+++ gd/libgd/tests/CMakeLists.txt	Thu Oct  4 12:14:56 2007
@@ -26,6 +26,9 @@
 	#FIND_LIBRARY(GD_LIB "gd" PATHS ${GD_LIBS_DIR})
 	#message(STATUS "GD_LIB: ${GD_LIB}")
 
+	include_directories (BEFORE ${GD_INCLUDE_DIR} "${GDTEST_SOURCE_DIR}" "${CMAKE_BINARY_DIR}")
+
+
 	SET(TESTS_DIRS
 		gdtest
 		gdimagearc