cvs: gd /gd-pango CMakeLists.txt gd_pango.c /gd-pango/cmake/modules FindGD.cmake /gd-pango/examples CMakeLists.txt /gd-pango/tests CMakeLists.txt
/gd-pango/tests/pango CMakeLists.txt
| From: | Takeshi Abe | Date: | Sun, 31 Aug 2008 17:07:09 +0000 |
| Subject: | cvs: gd /gd-pango CMakeLists.txt gd_pango.c /gd-pango/cmake/modules FindGD.cmake /gd-pango/examples CMakeLists.txt /gd-pango/tests CMakeLists.txt /gd-pango/tests/pango CMakeLists.txt |
||
| Groups: | php.gd.cvs | ||
| Request: | Send a blank email to php-gd-cvs+get-534@lists.php.net to get a copy of this message | ||
tabe Sun Aug 31 17:07:09 2008 UTC
Added files:
/gd/gd-pango CMakeLists.txt
/gd/gd-pango/tests CMakeLists.txt
/gd/gd-pango/tests/pango CMakeLists.txt
/gd/gd-pango/examples CMakeLists.txt
/gd/gd-pango/cmake/modules FindGD.cmake
Modified files:
/gd/gd-pango gd_pango.c
Log:
skeletons of CMakeLists.txt for gd-pango (see FS#175)
* borrowed FindGD.cmake from libgd
* include <...> -> "..."
http://cvs.php.net/viewvc.cgi/gd/gd-pango/gd_pango.c?r1=1.11&r2=1.12&diff_format=u
Index: gd/gd-pango/gd_pango.c
diff -u gd/gd-pango/gd_pango.c:1.11 gd/gd-pango/gd_pango.c:1.12
--- gd/gd-pango/gd_pango.c:1.11 Tue Jul 15 04:02:50 2008
+++ gd/gd-pango/gd_pango.c Sun Aug 31 17:07:08 2008
@@ -15,7 +15,7 @@
| Authors: Pierre-A. Joye <pierre@php.net> |
+----------------------------------------------------------------------+
*/
-/* $Id: gd_pango.c,v 1.11 2008/07/15 04:02:50 tabe Exp $ */
+/* $Id: gd_pango.c,v 1.12 2008/08/31 17:07:08 tabe Exp $ */
/**
* @file
* @brief Pango support for GD
@@ -24,7 +24,7 @@
*
* @author Pierre-Alain Joye
* @date 2006/12/19
- * $Id: gd_pango.c,v 1.11 2008/07/15 04:02:50 tabe Exp $
+ * $Id: gd_pango.c,v 1.12 2008/08/31 17:07:08 tabe Exp $
*/
/**
* \mainpage
@@ -95,11 +95,11 @@
#include <pango/pango.h>
#include <pango/pangoft2.h>
-#include <gd.h>
-#include <gd_pango.h>
#include <math.h>
#include <fontconfig/fontconfig.h>
#include <fontconfig/fcfreetype.h>
+#include <gd.h>
+#include "gd_pango.h"
/*! non-zero if initialized */
static int GD_PANGO_IS_INITIALIZED = 0;
http://cvs.php.net/viewvc.cgi/gd/gd-pango/CMakeLists.txt?view=markup&rev=1.1
Index: gd/gd-pango/CMakeLists.txt
+++ gd/gd-pango/CMakeLists.txt
# $id$
cmake_minimum_required(VERSION 2.6)
project(GD_PANGO C)
set(CMAKE_MODULE_PATH "${GD_PANGO_SOURCE_DIR}/cmake/modules")
find_package(GD REQUIRED)
check_library_exists("${GD_LIBRARY}" "gdColorMapLookup"
"${GD_LIB_PATH}" GD_2_1_FEATURE)
if(NOT GD_2_1_FEATURE)
message(FATAL_ERROR "Could not find gd 2.1.x feature")
endif(NOT GD_2_1_FEATURE)
find_package(PkgConfig)
pkg_check_modules(PANGOFT2 REQUIRED pangoft2)
include_directories(${GD_INCLUDE_DIR})
link_directories(${GD_LIBRARY_DIR})
include_directories(${PANGOFT2_INCLUDE_DIRS})
link_directories(${PANGOFT2_LIBRARY_DIRS})
add_library(gd_pango SHARED gd_pango)
target_link_libraries(gd_pango ${PANGOFT2_LIBRARIES} ${GD_LIBRARY})
add_subdirectory(examples)
add_subdirectory(tests)
if(BUILD_TESTING)
enable_testing()
endif(BUILD_TESTING)
set(CPACK_PACKAGE_NAME gd-pango)
set(CPACK_PACKAGE_VERSION_MAJOR 0)
set(CPACK_PACKAGE_VERSION_MINOR 0)
set(CPACK_PACKAGE_VERSION_PATCH 0)
set(CPACK_PACKAGE_VENDOR "http://libgd.org")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "gd-pango, Pango support for GD")
set(CPACK_RESOURCE_FILE_LICENSE "${GD_PANGO_SOURCE_DIR}/LICENSE.NEWBSD")
set(CPACK_RESOURCE_FILE_README "${GD_PANGO_SOURCE_DIR}/README")
include(CPack)
http://cvs.php.net/viewvc.cgi/gd/gd-pango/tests/CMakeLists.txt?view=markup&rev=1.1
Index: gd/gd-pango/tests/CMakeLists.txt
+++ gd/gd-pango/tests/CMakeLists.txt
# $id$
SET(TESTS_SUBDIRS
pango
)
if(BUILD_TESTING)
include_directories(BEFORE "${GD_PANGO_SOURCE_DIR}")
foreach(tests_subdir ${TESTS_SUBDIRS})
add_subdirectory(${tests_subdir})
endforeach(tests_subdir)
endif(BUILD_TESTING)
http://cvs.php.net/viewvc.cgi/gd/gd-pango/tests/pango/CMakeLists.txt?view=markup&rev=1.1
Index: gd/gd-pango/tests/pango/CMakeLists.txt
+++ gd/gd-pango/tests/pango/CMakeLists.txt
# $id$
set(TESTS_FILES
units
)
foreach(test_name ${TESTS_FILES})
add_executable(${test_name} "${test_name}.c")
target_link_libraries(${test_name} gd_pango)
add_test(${test_name} "${EXECUTABLE_OUTPUT_PATH}/${test_name}")
endforeach(test_name)
http://cvs.php.net/viewvc.cgi/gd/gd-pango/examples/CMakeLists.txt?view=markup&rev=1.1
Index: gd/gd-pango/examples/CMakeLists.txt
+++ gd/gd-pango/examples/CMakeLists.txt
# $id$
SET(GD_PANGO_EXAMPLES
rotated
simple
)
include_directories(BEFORE "${GD_PANGO_SOURCE_DIR}")
foreach(example ${GD_PANGO_EXAMPLES})
add_executable(${example} "${example}.c")
target_link_libraries(${example} gd_pango)
endforeach(example)
http://cvs.php.net/viewvc.cgi/gd/gd-pango/cmake/modules/FindGD.cmake?view=markup&rev=1.1
Index: gd/gd-pango/cmake/modules/FindGD.cmake
+++ gd/gd-pango/cmake/modules/FindGD.cmake
# - Find GD
# Find the native GD includes and library
# This module defines
# GD_INCLUDE_DIR, where to find gd.h, etc.
# GD_LIBRARIES, the libraries needed to use GD.
# GD_FOUND, If false, do not try to use GD.
# also defined, but not for general use are
# GD_LIBRARY, where to find the GD library.
# GD_SUPPORTS_PNG, GD_SUPPORTS_JPEG, GD_SUPPORTS_GIF, test
# support for image formats in GD.
FIND_PATH(GD_INCLUDE_DIR gd.h
/usr/local/include
/usr/include
)
if(WIN32 AND NOT CYGWIN)
SET(GD_NAMES ${GD_NAMES} bgd)
else(WIN32)
SET(GD_NAMES ${GD_NAMES} gd)
endif(WIN32 AND NOT CYGWIN)
FIND_LIBRARY(GD_LIBRARY
NAMES ${GD_NAMES}
PATHS /usr/lib64 /usr/lib /usr/local/lib
)
IF (GD_LIBRARY AND GD_INCLUDE_DIR)
SET(GD_LIBRARIES ${GD_LIBRARY})
SET(GD_FOUND "YES")
ELSE (GD_LIBRARY AND GD_INCLUDE_DIR)
SET(GD_FOUND "NO")
ENDIF (GD_LIBRARY AND GD_INCLUDE_DIR)
message("Found GD: ${GD_FOUND}")
IF (GD_FOUND)
IF (WIN32 AND NOT CYGWIN)
SET(GD_SUPPORTS_PNG ON)
SET(GD_SUPPORTS_JPEG ON)
SET(GD_SUPPORTS_GIF ON)
get_filename_component(GD_LIBRARY_DIR ${GD_LIBRARY} PATH)
ELSE (WIN32 AND NOT CYGWIN)
INCLUDE(CheckLibraryExists)
GET_FILENAME_COMPONENT(GD_LIB_PATH ${GD_LIBRARY} PATH)
GET_FILENAME_COMPONENT(GD_LIB ${GD_LIBRARY} NAME)
CHECK_LIBRARY_EXISTS("${GD_LIBRARY}" "gdImagePng" "${GD_LIB_PATH}"
GD_SUPPORTS_PNG)
IF (GD_SUPPORTS_PNG)
find_package(PNG)
IF (PNG_FOUND)
SET(GD_LIBRARIES ${GD_LIBRARIES} ${PNG_LIBRARIES})
SET(GD_INCLUDE_DIR ${GD_INCLUDE_DIR} ${PNG_INCLUDE_DIR})
ELSE (PNG_FOUND)
SET(GD_SUPPORTS_PNG "NO")
ENDIF (PNG_FOUND)
ENDIF (GD_SUPPORTS_PNG)
CHECK_LIBRARY_EXISTS("${GD_LIBRARY}" "gdImageJpeg" "${GD_LIB_PATH}"
GD_SUPPORTS_JPEG)
IF (GD_SUPPORTS_JPEG)
find_package(JPEG)
IF (JPEG_FOUND)
SET(GD_LIBRARIES ${GD_LIBRARIES} ${JPEG_LIBRARIES})
SET(GD_INCLUDE_DIR ${GD_INCLUDE_DIR} ${JPEG_INCLUDE_DIR})
ELSE (JPEG_FOUND)
SET(GD_SUPPORTS_JPEG "NO")
ENDIF (JPEG_FOUND)
ENDIF (GD_SUPPORTS_JPEG)
CHECK_LIBRARY_EXISTS("${GD_LIBRARY}" "gdImageGif" "${GD_LIB_PATH}"
GD_SUPPORTS_GIF)
# Trim the list of include directories
SET(GDINCTRIM)
FOREACH(GD_DIR ${GD_INCLUDE_DIR})
SET(GD_TMP_FOUND OFF)
FOREACH(GD_TRIMMED ${GDINCTRIM})
IF ("${GD_DIR}" STREQUAL "${GD_TRIMMED}")
SET(GD_TMP_FOUND ON)
ENDIF ("${GD_DIR}" STREQUAL "${GD_TRIMMED}")
ENDFOREACH(GD_TRIMMED ${GDINCTRIM})
IF (NOT GD_TMP_FOUND)
SET(GDINCTRIM "${GDINCTRIM}" "${GD_DIR}")
ENDIF (NOT GD_TMP_FOUND)
ENDFOREACH(GD_DIR ${GD_INCLUDE_DIR})
SET(GD_INCLUDE_DIR ${GDINCTRIM})
SET(GD_LIBRARY_DIR)
# Generate trimmed list of library directories and list of libraries
FOREACH(GD_LIB ${GD_LIBRARIES})
GET_FILENAME_COMPONENT(GD_NEXTLIBDIR ${GD_LIB} PATH)
SET(GD_TMP_FOUND OFF)
FOREACH(GD_LIBDIR ${GD_LIBRARY_DIR})
IF ("${GD_NEXTLIBDIR}" STREQUAL "${GD_LIBDIR}")
SET(GD_TMP_FOUND ON)
ENDIF ("${GD_NEXTLIBDIR}" STREQUAL "${GD_LIBDIR}")
ENDFOREACH(GD_LIBDIR ${GD_LIBRARIES})
IF (NOT GD_TMP_FOUND)
SET(GD_LIBRARY_DIR "${GD_LIBRARY_DIR}" "${GD_NEXTLIBDIR}")
ENDIF (NOT GD_TMP_FOUND)
ENDFOREACH(GD_LIB ${GD_LIBRARIES})
ENDIF (WIN32 AND NOT CYGWIN)
ENDIF (GD_FOUND)
IF (GD_FOUND)
IF (NOT GD_FIND_QUIETLY)
MESSAGE(STATUS "Found GD: ${GD_LIBRARY}")
ENDIF (NOT GD_FIND_QUIETLY)
ELSE (GD_FOUND)
IF (GD_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could not find GD library")
ENDIF (GD_FIND_REQUIRED)
ENDIF (GD_FOUND)
MARK_AS_ADVANCED(
GD_LIBRARY
GD_LIBRARIES
GD_INCLUDE_DIR
GD_LIBRARY_DIR
GD_SUPPORTS_PNG
GD_SUPPORTS_JPEG
GD_SUPPORTS_GIF
)