cvs: gd(GD_2_0) /libgd CMakeLists.txt
[email protected] ("Pierre-Alain Joye")
| Newsgroups | php.gd.cvs |
|---|---|
| Message-ID | <cvspajoye1173715290@cvsserver> |
pajoye Mon Mar 12 16:01:30 2007 UTC
Modified files: (Branch: GD_2_0)
/gd/libgd CMakeLists.txt
Log:
- generate config.h in the BUIL_DIR instead of the SOURCE_DIR
- drop old commented lines
http://cvs.php.net/viewvc.cgi/gd/libgd/CMakeLists.txt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: gd/libgd/CMakeLists.txt
diff -u gd/libgd/CMakeLists.txt:1.1.2.1 gd/libgd/CMakeLists.txt:1.1.2.2
--- gd/libgd/CMakeLists.txt:1.1.2.1 Mon Feb 26 23:39:43 2007
+++ gd/libgd/CMakeLists.txt Mon Mar 12 16:01:30 2007
@@ -87,27 +87,14 @@
SET(HAVE_LIBFONTCONFIG 1)
ENDIF(FONTCONFIG_FOUND)
- #FIND_PATH(HAVE_ERRNO_H errno.h)
- #FIND_PATH(HAVE_STRINGS_H strings.h)
- #FIND_PATH(HAVE_LIMITS_H limits.h )
- #SET(HAVE_ERRNO_H 1)
- #SET(HAVE_LIBM 1)
- #FIND_PATH(HAVE_MEMORY_H memory.h)
-
- #FIND_PATH(HAVE_STRING_H string.h)
- #FIND_PATH(HAVE_SYS_STAT_H 1)
- #FIND_PATH(HAVE_SYS_TYPES_H 1)
- #FIND_PATH(HAVE_UNISTD_H unistd.h)
- #FIND_PATH(STDC_HEADERS 1)
- #FIND_PATH(HAVE_INTTYPES_H 1)
- #FIND_PATH(HAVE_STDDEF_H stddef.h)
- #FIND_PATH(HAVE_STDINT_H 1)
- #FIND_PATH(HAVE_STDLIB_H stdlib.h)
-
SET(HAVE_CONFIG_H 1)
ADD_DEFINITIONS(-DHAVE_CONFIG_H)
+ INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/ ${GD_SOURCE_DIR})
+
+ CONFIGURE_FILE(${GD_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h ESCAPE_QUOTES)
+
SET (LIBGD_SRC_FILES
gd.c
gdfx.c
@@ -145,10 +132,6 @@
set(BUILD_SHARED_LIBS On)
- INCLUDE_DIRECTORIES(BEFORE ${GD_SOURCE_DIR}/)
-
- CONFIGURE_FILE(config.h.cmake config.h ESCAPE_QUOTES)
-
add_library(gd ${LIBGD_SRC_FILES})
target_link_libraries(gd ${FREETYPE_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${XPM_LIBRARIES} ${FONTCONFIG_LIBRARIES})
SET(GD_LIB gd)