cvs: gd /libgd CMakeLists.txt

[email protected] ("Pierre-Alain Joye") Sat, 09 Feb 2008 01:59:27 -0000
Newsgroups php.gd.cvs
Message-ID <cvspajoye1202522367@cvsserver>
pajoye		Sat Feb  9 01:59:27 2008 UTC

  Modified files:              
    /gd/libgd	CMakeLists.txt 
  Log:
  - fix test for the build type
  - add profile options
  - don't try to find pthread on windows
  
  
http://cvs.php.net/viewvc.cgi/gd/libgd/CMakeLists.txt?r1=1.14&r2=1.15&diff_format=u
Index: gd/libgd/CMakeLists.txt
diff -u gd/libgd/CMakeLists.txt:1.14 gd/libgd/CMakeLists.txt:1.15
--- gd/libgd/CMakeLists.txt:1.14	Sun Jan 13 21:23:45 2008
+++ gd/libgd/CMakeLists.txt	Sat Feb  9 01:59:27 2008
@@ -1,4 +1,4 @@
-# $Id: CMakeLists.txt,v 1.14 2008/01/13 21:23:45 pajoye Exp $
+# $Id: CMakeLists.txt,v 1.15 2008/02/09 01:59:27 pajoye Exp $
 
 SET(PACKAGE GD)
 SET(PACKAGE_NAME GD)
@@ -35,10 +35,12 @@
 endif(BUILD_TEST)
 
 if (NOT WIN32)
-	STRING(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER)
-	IF (CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
-		set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -O0")
-	ENDIF (CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
+	if(DEFINED CMAKE_BUILD_TYPE)
+		STRING(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER)
+		IF (CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
+			set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -O0")
+		ENDIF (CMAKE_BUILD_TYPE_TOLOWER MATCHES debug)
+	endif(DEFINED CMAKE_BUILD_TYPE)
 endif (NOT WIN32)
 
 if (USE_EXT_GD)
@@ -84,6 +86,13 @@
 
 	FIND_PACKAGE(ZLIB)
 
+	IF (NOT WIN32)
+		FIND_PACKAGE(PTHREAD)
+	ENDIF (NOT WIN32)
+
+	FIND_PACKAGE(Freetype)
+	FIND_PACKAGE(XPM)
+
 	if (ENABLE_JPEG)
 		FIND_PACKAGE(JPEG)
 	endif (ENABLE_JPEG)
@@ -108,8 +117,6 @@
 		FIND_PACKAGE(Fontconfig)
 	endif (ENABLE_FONTCONFIG)
 
-
-
 	if (FREETYPE_FOUND)
 		INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIR})
 		SET(HAVE_FT2BUILD_H 1)
@@ -166,6 +173,11 @@
 		SET(GD_LIB gd)
 	endif (WIN32)
 
+	IF(PROFILE)
+		add_definitions("-pg")
+		set(CMAKE_EXE_LINKER_FLAGS ${LINK_FLAGS} "-pg")
+	ENDIF(PROFILE)
+
 	SET(GD_INCLUDE_DIR "${GD_SOURCE_DIR}/src" "${GD_SOURCE_DIR}")
 	INCLUDE_DIRECTORIES(before ${FONTCONFIG_INCLUDE_DIR})