- generate config.h in the BUIL_DIR instead of the SOURCE_DIR
 - drop old commented lines
master
pajoye 2007-03-12 16:05:29 +00:00
parent 63e8e503c4
commit 009d0b8408
1 changed files with 7 additions and 22 deletions

View File

@ -91,27 +91,14 @@ else (USE_EXT_GD)
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
@ -148,18 +135,16 @@ else (USE_EXT_GD)
set(BUILD_SHARED_LIBS On)
INCLUDE_DIRECTORIES(BEFORE ${GD_SOURCE_DIR}/)
CONFIGURE_FILE(config.h.cmake config.h ESCAPE_QUOTES)
if (WIN32)
SET(GD_LIB bgd)
ADD_DEFINITIONS(/nodefaultlib:library)
else(WIN32)
SET(GD_LIB gd)
endif(WIN32)
add_library(${GD_LIB} ${LIBGD_SRC_FILES})
target_link_libraries(${GD_LIB} ${FREETYPE_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${XPM_LIBRARIES} ${FONTCONFIG_LIBRARIES})
endif (USE_EXT_GD)
add_subdirectory(tests)
add_subdirectory(tests)