cvs: gd /libgd CMakeLists.txt

pajoye		Mon Mar 12 16:05:29 2007 UTC

  Modified files:              
    /gd/libgd	CMakeLists.txt 
  Log:
  -MFB:
   - generate config.h in the BUIL_DIR instead of the SOURCE_DIR
   - drop old commented lines
  
http://cvs.php.net/viewvc.cgi/gd/libgd/CMakeLists.txt?r1=1.3&r2=1.4&diff_format=u
Index: gd/libgd/CMakeLists.txt
diff -u gd/libgd/CMakeLists.txt:1.3 gd/libgd/CMakeLists.txt:1.4
--- gd/libgd/CMakeLists.txt:1.3	Wed Mar  7 19:30:17 2007
+++ gd/libgd/CMakeLists.txt	Mon Mar 12 16:05:29 2007
@@ -91,27 +91,14 @@
 		SET(HAVE_LIBFONTCONFIG 1)
 	ENDIF(FONTCONFIG_FOUND)
 
-	#FIND_PATH(HAVE_ERRNO_H errno.h)
-	#FIND_PATH(HAVE_STRINGS_H strings.h)
-	#FIND_PATH(HAVE_LIMITS_H limits.h )
-	#SET(HAVE_ERRNO_H 1)
-	#SET(HAVE_LIBM 1)
-	#FIND_PATH(HAVE_MEMORY_H memory.h)
-
-	#FIND_PATH(HAVE_STRING_H string.h)
-	#FIND_PATH(HAVE_SYS_STAT_H 1)
-	#FIND_PATH(HAVE_SYS_TYPES_H 1)
-	#FIND_PATH(HAVE_UNISTD_H unistd.h)
-	#FIND_PATH(STDC_HEADERS 1)
-	#FIND_PATH(HAVE_INTTYPES_H 1)
-	#FIND_PATH(HAVE_STDDEF_H stddef.h)
-	#FIND_PATH(HAVE_STDINT_H 1)
-	#FIND_PATH(HAVE_STDLIB_H stdlib.h)
-
 	SET(HAVE_CONFIG_H 1)
 
 	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
@@ -148,18 +135,16 @@
 
 	set(BUILD_SHARED_LIBS On)
 
-	INCLUDE_DIRECTORIES(BEFORE ${GD_SOURCE_DIR}/)
-
-	CONFIGURE_FILE(config.h.cmake config.h ESCAPE_QUOTES)
-
 	if (WIN32)
 		SET(GD_LIB bgd)
+		ADD_DEFINITIONS(/nodefaultlib:library)
 	else(WIN32)
 		SET(GD_LIB gd)
 	endif(WIN32)
+
 	add_library(${GD_LIB} ${LIBGD_SRC_FILES})
 	target_link_libraries(${GD_LIB} ${FREETYPE_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${XPM_LIBRARIES} ${FONTCONFIG_LIBRARIES})
 
 endif (USE_EXT_GD)
 
-add_subdirectory(tests)
\ No newline at end of file
+add_subdirectory(tests)