cvs: gd /libgd CMakeLists.txt

pajoye		Sat Apr 19 10:34:45 2008 UTC

  Modified files:              
    /gd/libgd	CMakeLists.txt 
  Log:
  - add ms-bitfields flag when mingw is used (forced)
  - define GDLIB-static
  
http://cvs.php.net/viewvc.cgi/gd/libgd/CMakeLists.txt?r1=1.17&r2=1.18&diff_format=u
Index: gd/libgd/CMakeLists.txt
diff -u gd/libgd/CMakeLists.txt:1.17 gd/libgd/CMakeLists.txt:1.18
--- gd/libgd/CMakeLists.txt:1.17	Wed Feb 27 13:27:49 2008
+++ gd/libgd/CMakeLists.txt	Sat Apr 19 10:34:45 2008
@@ -1,33 +1,11 @@
-# $Id: CMakeLists.txt,v 1.17 2008/02/27 13:27:49 pajoye Exp $
+# $Id: CMakeLists.txt,v 1.18 2008/04/19 10:34:45 pajoye Exp $
 
 SET(PACKAGE GD)
 SET(PACKAGE_NAME GD)
 
-CMAKE_MINIMUM_REQUIRED(VERSION 2.4.3 FATAL_ERROR)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.4.4 FATAL_ERROR)
 PROJECT(GD)
-SET(CPACK_PACKAGE_NAME "libgd")
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "libGD, powerful and easy to use graphic library")
-SET(CPACK_PACKAGE_VENDOR "http://www.libgd.org")
-SET(CPACK_PACKAGE_VERSION_MAJOR "2")
-SET(CPACK_PACKAGE_VERSION_MINOR "1")
-SET(CPACK_PACKAGE_VERSION_PATCH "0")
-
-set(CPACK_GENERATOR TGZ)
-
-
-set(CPACK_SOURCE_GENERATOR TGZ)
-set(CPACK_SOURCE_IGNORE_FILES
-"~$"
-"\\\\.swp$"
-"\\\\.cvsignore$"
-"^${PROJECT_SOURCE_DIR}.*/CVS/"
-"^${PROJECT_SOURCE_DIR}/debian/"
-"^${PROJECT_SOURCE_DIR}/old/"
-"^${PROJECT_SOURCE_DIR}/bld/"
-"^${PROJECT_SOURCE_DIR}/autom4te\\\\.cache/"
-)
 
-INCLUDE(CPack)
 SET(CMAKE_MODULE_PATH "${GD_SOURCE_DIR}/cmake/modules")
 
 OPTION(ENABLE_PNG "Enable PNG support" 1)
@@ -80,8 +58,6 @@
 
 	SET(CMAKE_REQUIRED_INCLUDES "/usr/include" "/usr/local/include")
 
-	message(STATUS "ft2build: ${CMAKE_REQUIRED_INCLUDES}")
-
 	include(CheckIncludeFiles)
 	include(CheckIncludeFile)
 
@@ -89,6 +65,8 @@
 	include(CheckPrototypeExists)
 	SET(FONTCONFIG_FIND_QUIETLY, 1)
 
+	message(STATUS "PNG Support: ${ENABLE_PNG}")
+
 	if (ENABLE_PNG)
 		FIND_PACKAGE(PNG REQUIRED)
 	endif (ENABLE_PNG)
@@ -130,6 +108,7 @@
 		INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIR})
 		SET(HAVE_FT2BUILD_H 1)
 		SET(HAVE_LIBFREETYPE 1)
+		MESSAGE("Freetype found******************************")
 	ENDIF(FREETYPE_FOUND)
 
 	IF(ZLIB_FOUND)
@@ -178,10 +157,19 @@
 	if (WIN32)
 		SET(GD_LIB bgd)
 		ADD_DEFINITIONS( -DWIN32 -D_WIN32 -DMSWIN32 -DBGDWIN32 -DWINVER=0x0500  -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0600)
+
+		if(NOT MINGW AND MSVC_VERSION GREATER 1399)
+			ADD_DEFINITIONS("/D_CRT_SECURE_NO_DEPRECATE")
+		endif(NOT MINGW AND MSVC_VERSION GREATER 1399)
+		if (MINGW)
+			ADD_DEFINITIONS("-mms-bitfields -m32")
+		endif (MINGW)
 	else (WIN32)
 		SET(GD_LIB gd)
 	endif (WIN32)
 
+	SET(GD_LIB_STATIC "${GD_LIB}-static")
+
 	IF(PROFILE)
 		add_definitions("-pg")
 		set(CMAKE_EXE_LINKER_FLAGS ${LINK_FLAGS} "-pg")
@@ -196,3 +184,32 @@
 add_subdirectory(tests)
 add_subdirectory(examples)
 
+
+SET(CPACK_PACKAGE_NAME "libgd")
+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "libGD, powerful and easy to use graphic library")
+SET(CPACK_PACKAGE_VENDOR "http://www.libgd.org")
+SET(CPACK_PACKAGE_VERSION_MAJOR "2")
+SET(CPACK_PACKAGE_VERSION_MINOR "1")
+SET(CPACK_PACKAGE_VERSION_PATCH "0")
+
+if(WIN32)
+	set(CPACK_GENERATOR ZIP)
+else(WIN32)
+	set(CPACK_GENERATOR TGZ)
+endif(WIN32)
+
+
+set(CPACK_SOURCE_GENERATOR TGZ)
+set(CPACK_SOURCE_IGNORE_FILES
+"~$"
+"\\\\.swp$"
+"\\\\.cvsignore$"
+"^${PROJECT_SOURCE_DIR}.*/CVS/"
+"^${PROJECT_SOURCE_DIR}/debian/"
+"^${PROJECT_SOURCE_DIR}/old/"
+"^${PROJECT_SOURCE_DIR}/bld/"
+"^${PROJECT_SOURCE_DIR}/autom4te\\\\.cache/"
+)
+install(FILES ${top_level_DOCFILES} DESTINATION ${DOC_DIR})
+INCLUDE(CPack)
+