cvs: gd(GD_2_0) /libgd CMakeLists.txt

pajoye		Tue Apr 17 10:56:32 2007 UTC

  Modified files:              (Branch: GD_2_0)
    /gd/libgd	CMakeLists.txt 
  Log:
  - MFH: name the dll bgd not gd
  - make fontconfig optional on win32
  
http://cvs.php.net/viewvc.cgi/gd/libgd/CMakeLists.txt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: gd/libgd/CMakeLists.txt
diff -u gd/libgd/CMakeLists.txt:1.1.2.2 gd/libgd/CMakeLists.txt:1.1.2.3
--- gd/libgd/CMakeLists.txt:1.1.2.2	Mon Mar 12 16:01:30 2007
+++ gd/libgd/CMakeLists.txt	Tue Apr 17 10:56:32 2007
@@ -45,18 +45,20 @@
 
 	include(AC_HEADER_STDC)
 	include(CheckPrototypeExists)
+	SET(FONTCONFIG_FIND_QUIETLY, 1)
 
 	FIND_PACKAGE(PNG REQUIRED)
 	FIND_PACKAGE(ZLIB)
 	FIND_PACKAGE(JPEG)
+IF (NOT WIN32)
 	FIND_PACKAGE(PTHREAD)
+ENDIF (NOT WIN32)
 	FIND_PACKAGE(Freetype)
 	FIND_PACKAGE(XPM)
 	FIND_PACKAGE(Fontconfig)
 
 	if (FREETYPE_FOUND)
 		INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIR})
-		message(STATUS "ft2build: ${HAVE_FT2BUILD_H} ${FREETYPE_INCLUDE_DIR}")
 		SET(HAVE_FT2BUILD_H 1)
 		SET(HAVE_LIBFREETYPE 1)
 	ENDIF(FREETYPE_FOUND)
@@ -85,12 +87,18 @@
 	IF(FONTCONFIG_FOUND)
 		INCLUDE_DIRECTORIES(${FONTCONFIG_INCLUDE_DIR})
 		SET(HAVE_LIBFONTCONFIG 1)
+	ELSE (FONTCONFIG_FOUND)
+		SET(FONTCONFIG_LIBRARIES "")
 	ENDIF(FONTCONFIG_FOUND)
 
 	SET(HAVE_CONFIG_H 1)
 
 	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)
@@ -132,9 +140,21 @@
 
 	set(BUILD_SHARED_LIBS On)
 
-	add_library(gd ${LIBGD_SRC_FILES})
-	target_link_libraries(gd ${FREETYPE_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${XPM_LIBRARIES} ${FONTCONFIG_LIBRARIES})
-	SET(GD_LIB gd)
+	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})
+
 endif (USE_EXT_GD)
 
 add_subdirectory(tests)