Attachment #147366 for bug #204524

View | Details | Raw Unified | Return to bug 204524
Collapse All | Expand All




# also defined, but not for general use are
#  FREETYPE_LIBRARY, where to find the freetype library.

if (FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR)
  
  # in cache already
  set(FREETYPE_FOUND TRUE)
  
else (FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR)
  
  FIND_PROGRAM(FREETYPECONFIG_EXECUTABLE NAMES freetype-config PATHS
    $ENV{PATH}
    /usr/bin
    /usr/local/bin
    /opt/local/bin
    NO_DEFAULT_PATH
    )
  FIND_PROGRAM(FREETYPECONFIG_EXECUTABLE NAMES freetype-config)
  
  #reset vars
  set(FREETYPE_LIBRARIES)
  set(FREETYPE_INCLUDE_DIR)
  
  # if freetype-config has been found
  if(FREETYPECONFIG_EXECUTABLE)
    
    EXEC_PROGRAM(${FREETYPECONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE FREETYPE_LIBRARIES)
    
    EXEC_PROGRAM(${FREETYPECONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE FREETYPE_INCLUDE_DIR)
    if(FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR)
      set(FREETYPE_FOUND TRUE)
      #message(STATUS "Found freetype: ${FREETYPE_LIBRARIES}")
    endif(FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR)
    
    
    set( FREETYPE_LIBRARIES ${FREETYPE_LIBRARIES} CACHE INTERNAL "The libraries for freetype" )
    
  endif(FREETYPECONFIG_EXECUTABLE)
 	
endif (FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR)

IF(FREETYPE_FOUND)
  IF(NOT FREETYPE_FIND_QUIETLY)
    MESSAGE(STATUS "Found FREETYPE: ${FREETYPE_LIBRARIES}")
  ENDIF(NOT FREETYPE_FIND_QUIETLY)
ELSE(FREETYPE_FOUND)
  IF(FREETYPE_FIND_REQUIRED)
    MESSAGE(FATAL_ERROR "Could not find FREETYPE")
  ENDIF(FREETYPE_FIND_REQUIRED)
ENDIF(FREETYPE_FOUND)
ELSE (FREETYPE_LIBRARY AND FREETYPE_INCLUDE_DIR)
  SET(FREETYPE_FOUND "NO")
ENDIF (FREETYPE_LIBRARY AND FREETYPE_INCLUDE_DIR)

Lines 47-53 Link Here

(-)freetype.cmake.orig (-1 / +1 lines)
47	else(WIN32)	47	else(WIN32)
48	set(	48	set(
49	PL_FREETYPE_FONT_PATH	49	PL_FREETYPE_FONT_PATH
50	"/usr/share/fonts/truetype/freefont"	50	"/usr/share/fonts/freefont-ttf"
51	CACHE PATH "Path for TrueType fonts"	51	CACHE PATH "Path for TrueType fonts"
52	)	52	)
53	endif(WIN32)	53	endif(WIN32)




    set(PLD_gif OFF CACHE BOOL "Enable gif device" FORCE)
  else (NOT GD_FOUND)

    if (WITH_FREETYPE)
      set(GD_INCLUDE_DIR ${GD_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIR})
      set(GD_LIBRARIES ${GD_LIBRARIES} ${FREETYPE_LIBRARIES})
    endif (WITH_FREETYPE)
  endif (NOT GD_FOUND)
endif(PLD_png OR PLD_jpeg OR PLD_gif)


  foreach(DIR ${GD_INCLUDE_DIR})
    set(gd_COMPILE_FLAGS "${gd_COMPILE_FLAGS} -I${DIR}")
  endforeach(DIR ${GD_INCLUDE_DIR})
  if (WITH_FREETYPE)
    set(gd_COMPILE_FLAGS "${gd_COMPILE_FLAGS} ${FREETYPE_INCLUDE_DIR}")
    set(GD_LIBRARIES ${GD_LIBRARIES} ${FREETYPE_LIBRARIES})
  endif (WITH_FREETYPE)

  # Generate library link commands
  set(gd_LINK_FLAGS ${GD_LIBRARIES})

Return to bug 204524

Lines 7-26 Link Here

(-)FindFreetype.cmake.orig (-16 / +46 lines)
7	# also defined, but not for general use are	7	# also defined, but not for general use are
8	# FREETYPE_LIBRARY, where to find the freetype library.	8	# FREETYPE_LIBRARY, where to find the freetype library.
9		9
10	FIND_PATH(FREETYPE_INCLUDE_DIR freetype/config/ftheader.h	10	if (FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR)
11	/usr/local/include/freetype2	11
12	/usr/include/freetype2	12	# in cache already
13	)	13	set(FREETYPE_FOUND TRUE)
		14
		15	else (FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR)
		16
		17	FIND_PROGRAM(FREETYPECONFIG_EXECUTABLE NAMES freetype-config PATHS
		18	$ENV{PATH}
		19	/usr/bin
		20	/usr/local/bin
		21	/opt/local/bin
		22	NO_DEFAULT_PATH
		23	)
		24	FIND_PROGRAM(FREETYPECONFIG_EXECUTABLE NAMES freetype-config)
		25
		26	#reset vars
		27	set(FREETYPE_LIBRARIES)
		28	set(FREETYPE_INCLUDE_DIR)
		29
		30	# if freetype-config has been found
		31	if(FREETYPECONFIG_EXECUTABLE)
		32
		33	EXEC_PROGRAM(${FREETYPECONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE FREETYPE_LIBRARIES)
		34
		35	EXEC_PROGRAM(${FREETYPECONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE FREETYPE_INCLUDE_DIR)
		36	if(FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR)
		37	set(FREETYPE_FOUND TRUE)
		38	#message(STATUS "Found freetype: ${FREETYPE_LIBRARIES}")
		39	endif(FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR)
		40
		41
		42	set( FREETYPE_LIBRARIES ${FREETYPE_LIBRARIES} CACHE INTERNAL "The libraries for freetype" )
		43
		44	endif(FREETYPECONFIG_EXECUTABLE)
		45
		46	endif (FREETYPE_LIBRARIES AND FREETYPE_INCLUDE_DIR)
14		47
15	SET(FREETYPE_NAMES ${FREETYPE_NAMES} freetype)	48	IF(FREETYPE_FOUND)
16	FIND_LIBRARY(FREETYPE_LIBRARY	49	IF(NOT FREETYPE_FIND_QUIETLY)
17	NAMES ${FREETYPE_NAMES}	50	MESSAGE(STATUS "Found FREETYPE: ${FREETYPE_LIBRARIES}")
18	PATHS /usr/lib /usr/local/lib	51	ENDIF(NOT FREETYPE_FIND_QUIETLY)
19	)	52	ELSE(FREETYPE_FOUND)
20		53	IF(FREETYPE_FIND_REQUIRED)
21	IF (FREETYPE_LIBRARY AND FREETYPE_INCLUDE_DIR)	54	MESSAGE(FATAL_ERROR "Could not find FREETYPE")
22	SET(FREETYPE_LIBRARIES ${FREETYPE_LIBRARY})	55	ENDIF(FREETYPE_FIND_REQUIRED)
23	SET(FREETYPE_FOUND "YES")	56	ENDIF(FREETYPE_FOUND)
24	ELSE (FREETYPE_LIBRARY AND FREETYPE_INCLUDE_DIR)
25	SET(FREETYPE_FOUND "NO")
26	ENDIF (FREETYPE_LIBRARY AND FREETYPE_INCLUDE_DIR)

Lines 44-53 Link Here

(-)gd.cmake.orig (-4 / +4 lines)
44	set(PLD_gif OFF CACHE BOOL "Enable gif device" FORCE)	44	set(PLD_gif OFF CACHE BOOL "Enable gif device" FORCE)
45	else (NOT GD_FOUND)	45	else (NOT GD_FOUND)
46		46
47	if (WITH_FREETYPE)
48	set(GD_INCLUDE_DIR ${GD_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIR})
49	set(GD_LIBRARIES ${GD_LIBRARIES} ${FREETYPE_LIBRARIES})
50	endif (WITH_FREETYPE)
51	endif (NOT GD_FOUND)	47	endif (NOT GD_FOUND)
52	endif(PLD_png OR PLD_jpeg OR PLD_gif)	48	endif(PLD_png OR PLD_jpeg OR PLD_gif)
53		49
Lines 71-76 Link Here
71	foreach(DIR ${GD_INCLUDE_DIR})	67	foreach(DIR ${GD_INCLUDE_DIR})
72	set(gd_COMPILE_FLAGS "${gd_COMPILE_FLAGS} -I${DIR}")	68	set(gd_COMPILE_FLAGS "${gd_COMPILE_FLAGS} -I${DIR}")
73	endforeach(DIR ${GD_INCLUDE_DIR})	69	endforeach(DIR ${GD_INCLUDE_DIR})
		70	if (WITH_FREETYPE)
		71	set(gd_COMPILE_FLAGS "${gd_COMPILE_FLAGS} ${FREETYPE_INCLUDE_DIR}")
		72	set(GD_LIBRARIES ${GD_LIBRARIES} ${FREETYPE_LIBRARIES})
		73	endif (WITH_FREETYPE)
74		74
75	# Generate library link commands	75	# Generate library link commands
76	set(gd_LINK_FLAGS ${GD_LIBRARIES})	76	set(gd_LINK_FLAGS ${GD_LIBRARIES})