"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "CMakeLists.txt" between
libgd-2.3.0.tar.gz and libgd-2.3.1.tar.gz

About: LibGD is a library for the dynamic creation of images by programmers (PNG, JPEG, GIF, WebP, XPM, BMP support).

CMakeLists.txt  (libgd-2.3.0):CMakeLists.txt  (libgd-2.3.1)
skipping to change at line 54 skipping to change at line 54
"Single Directory for all Executables." "Single Directory for all Executables."
) )
# --------- Setup the Executable output Directory ------------- # --------- Setup the Executable output Directory -------------
SET (CMAKE_ARCHIVE_OUTPUT_DIRECTORY SET (CMAKE_ARCHIVE_OUTPUT_DIRECTORY
${PROJECT_BINARY_DIR}/Bin ${PROJECT_BINARY_DIR}/Bin
CACHE PATH CACHE PATH
"Single Directory for all static libraries." "Single Directory for all static libraries."
) )
SET(PKG_REQUIRES_PRIVATES "")
if (USE_EXT_GD) if (USE_EXT_GD)
message("Using GD at: ${USE_EXT_GD}") message("Using GD at: ${USE_EXT_GD}")
INCLUDE_DIRECTORIES(BEFORE ${GD_INCLUDE_DIR}) INCLUDE_DIRECTORIES(BEFORE ${GD_INCLUDE_DIR})
FIND_PACKAGE(GD) FIND_PACKAGE(GD)
if (GD_FOUND) if (GD_FOUND)
INCLUDE_DIRECTORIES(BEFORE ${GD_INCLUDE_DIR}) INCLUDE_DIRECTORIES(BEFORE ${GD_INCLUDE_DIR})
LINK_DIRECTORIES(${GD_LIBRARIES}) LINK_DIRECTORIES(${GD_LIBRARIES})
SET(GD_LIB ${GD_LIBRARIES}) SET(GD_LIB ${GD_LIBRARIES})
SET(GD_LIBS_DIR ${GD_LIBRARY}) SET(GD_LIBS_DIR ${GD_LIBRARY})
skipping to change at line 97 skipping to change at line 99
execute_process( execute_process(
COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/config/getlib.sh $ {VER} COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/config/getlib.sh $ {VER}
OUTPUT_VARIABLE ${VAR} OUTPUT_VARIABLE ${VAR}
) )
ENDMACRO(GV_LT) ENDMACRO(GV_LT)
GV_LT(SONAME GDLIB_LIB_SOVERSION) GV_LT(SONAME GDLIB_LIB_SOVERSION)
GV_LT(VERSION GDLIB_LIB_VERSION) GV_LT(VERSION GDLIB_LIB_VERSION)
MESSAGE(STATUS "gd shared lib version ${GDLIB_LIB_SOVERSION} (${GDLIB_LIB _VERSION})") MESSAGE(STATUS "gd shared lib version ${GDLIB_LIB_SOVERSION} (${GDLIB_LIB _VERSION})")
SET(CMAKE_REQUIRED_INCLUDES "/usr/include" "/usr/local/include")
include(CheckIncludeFiles) include(CheckIncludeFiles)
include(CheckIncludeFile) include(CheckIncludeFile)
include(AC_HEADER_STDC) include(AC_HEADER_STDC)
include(CheckPrototypeExists) include(CheckPrototypeExists)
if (ENABLE_GD_FORMATS)
FIND_PACKAGE(ZLIB REQUIRED)
endif (ENABLE_GD_FORMATS)
if (ENABLE_PNG) if (ENABLE_PNG)
FIND_PACKAGE(ZLIB REQUIRED)
FIND_PACKAGE(PNG REQUIRED) FIND_PACKAGE(PNG REQUIRED)
endif (ENABLE_PNG) endif (ENABLE_PNG)
if (ENABLE_ICONV) if (ENABLE_ICONV)
FIND_PACKAGE(ICONV REQUIRED) FIND_PACKAGE(ICONV REQUIRED)
endif (ENABLE_ICONV) endif (ENABLE_ICONV)
FIND_PACKAGE(ZLIB)
IF (ENABLE_WEBP) IF (ENABLE_WEBP)
FIND_PACKAGE(WEBP) FIND_PACKAGE(WEBP REQUIRED)
ENDIF (ENABLE_WEBP) ENDIF (ENABLE_WEBP)
IF (ENABLE_LIQ) IF (ENABLE_LIQ)
FIND_PACKAGE(LIQ) FIND_PACKAGE(LIQ REQUIRED)
ENDIF (ENABLE_LIQ) ENDIF (ENABLE_LIQ)
IF (NOT WIN32) IF (NOT WIN32)
FIND_PACKAGE(PTHREAD) FIND_PACKAGE(PTHREAD)
ENDIF (NOT WIN32) ENDIF (NOT WIN32)
if (ENABLE_JPEG) if (ENABLE_JPEG)
FIND_PACKAGE(JPEG) FIND_PACKAGE(JPEG REQUIRED)
endif (ENABLE_JPEG) endif (ENABLE_JPEG)
if (ENABLE_TIFF) if (ENABLE_TIFF)
FIND_PACKAGE(TIFF) FIND_PACKAGE(TIFF REQUIRED)
endif (ENABLE_TIFF) endif (ENABLE_TIFF)
if (ENABLE_FREETYPE) if (ENABLE_FREETYPE)
FIND_PACKAGE(Freetype) FIND_PACKAGE(Freetype REQUIRED)
endif (ENABLE_FREETYPE) endif (ENABLE_FREETYPE)
if (ENABLE_XPM) if (ENABLE_XPM)
FIND_PACKAGE(XPM) FIND_PACKAGE(XPM REQUIRED)
endif (ENABLE_XPM) endif (ENABLE_XPM)
if (ENABLE_FONTCONFIG) if (ENABLE_FONTCONFIG)
FIND_PACKAGE(FontConfig) FIND_PACKAGE(FontConfig REQUIRED)
endif (ENABLE_FONTCONFIG) endif (ENABLE_FONTCONFIG)
if (ENABLE_RAQM) if (ENABLE_RAQM)
FIND_PACKAGE(RAQM) FIND_PACKAGE(RAQM REQUIRED)
endif (ENABLE_RAQM) endif (ENABLE_RAQM)
SET(ENABLE_GD_FORMATS ${ENABLE_GD_FORMATS}) SET(ENABLE_GD_FORMATS ${ENABLE_GD_FORMATS})
if (FREETYPE_FOUND) if (FREETYPE_FOUND)
INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIRS})
SET(HAVE_FT2BUILD_H 1) SET(HAVE_FT2BUILD_H 1)
SET(HAVE_LIBFREETYPE 1) SET(HAVE_LIBFREETYPE 1)
LIST(APPEND PKG_REQUIRES_PRIVATES freetype2)
ENDIF(FREETYPE_FOUND) ENDIF(FREETYPE_FOUND)
IF(ZLIB_FOUND) IF(ZLIB_FOUND)
INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
SET(HAVE_LIBZ 1) SET(HAVE_LIBZ 1)
LIST(APPEND PKG_REQUIRES_PRIVATES zlib)
ENDIF(ZLIB_FOUND) ENDIF(ZLIB_FOUND)
IF(WEBP_FOUND) IF(WEBP_FOUND)
INCLUDE_DIRECTORIES(${WEBP_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${WEBP_INCLUDE_DIR})
SET(HAVE_LIBWEBP 1) SET(HAVE_LIBWEBP 1)
ENDIF(WEBP_FOUND) ENDIF(WEBP_FOUND)
IF(PNG_FOUND) IF(PNG_FOUND)
INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR})
SET(HAVE_LIBPNG 1) SET(HAVE_LIBPNG 1)
LIST(APPEND PKG_REQUIRES_PRIVATES libpng)
ENDIF(PNG_FOUND) ENDIF(PNG_FOUND)
IF(ICONV_FOUND) IF(ICONV_FOUND)
INCLUDE_DIRECTORIES(${ICONV_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${ICONV_INCLUDE_DIR})
SET(HAVE_ICONV 1) SET(HAVE_ICONV 1)
SET(HAVE_ICONV_H 1) SET(HAVE_ICONV_H 1)
ENDIF(ICONV_FOUND) ENDIF(ICONV_FOUND)
IF(LIQ_FOUND) IF(LIQ_FOUND)
INCLUDE_DIRECTORIES(${LIQ_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${LIQ_INCLUDE_DIR})
SET(HAVE_LIBIMAGEQUANT 1) SET(HAVE_LIBIMAGEQUANT 1)
ENDIF(LIQ_FOUND) ENDIF(LIQ_FOUND)
IF(XPM_FOUND) IF(XPM_FOUND)
INCLUDE_DIRECTORIES(${XPM_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${XPM_INCLUDE_DIR})
SET(HAVE_LIBXPM 1) SET(HAVE_LIBXPM 1)
LIST(APPEND PKG_REQUIRES_PRIVATES xpm)
ENDIF(XPM_FOUND) ENDIF(XPM_FOUND)
IF(JPEG_FOUND) IF(JPEG_FOUND)
INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR})
SET(HAVE_LIBJPEG 1) SET(HAVE_LIBJPEG 1)
LIST(APPEND PKG_REQUIRES_PRIVATES libjpeg)
ENDIF(JPEG_FOUND) ENDIF(JPEG_FOUND)
IF(TIFF_FOUND) IF(TIFF_FOUND)
INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR})
SET(HAVE_LIBTIFF 1) SET(HAVE_LIBTIFF 1)
LIST(APPEND PKG_REQUIRES_PRIVATES libtiff-4)
ENDIF(TIFF_FOUND) ENDIF(TIFF_FOUND)
IF(FONTCONFIG_FOUND) IF(FONTCONFIG_FOUND)
INCLUDE_DIRECTORIES(${FONTCONFIG_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${FONTCONFIG_INCLUDE_DIR})
SET(HAVE_LIBFONTCONFIG 1) SET(HAVE_LIBFONTCONFIG 1)
LIST(APPEND PKG_REQUIRES_PRIVATES fontconfig)
ELSE (FONTCONFIG_FOUND) ELSE (FONTCONFIG_FOUND)
SET(FONTCONFIG_LIBRARY "") SET(FONTCONFIG_LIBRARY "")
SET(FONTCONFIG_INCLUDE_DIR "") SET(FONTCONFIG_INCLUDE_DIR "")
SET(FONTCONFIG_LIB_DIR "") SET(FONTCONFIG_LIB_DIR "")
ENDIF(FONTCONFIG_FOUND) ENDIF(FONTCONFIG_FOUND)
IF(RAQM_FOUND) IF(RAQM_FOUND)
INCLUDE_DIRECTORIES(${RAQM_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${RAQM_INCLUDE_DIR})
SET(HAVE_RAQM 1)
LIST(APPEND PKG_REQUIRES_PRIVAES raqm)
ENDIF(RAQM_FOUND) ENDIF(RAQM_FOUND)
string(REPLACE ";" ", " PKG_REQUIRES_PRIVATES "${PKG_REQUIRES_PRIVATES}")
SET(HAVE_CONFIG_H 1) SET(HAVE_CONFIG_H 1)
ADD_DEFINITIONS(-DHAVE_CONFIG_H) ADD_DEFINITIONS(-DHAVE_CONFIG_H)
CHECK_INCLUDE_FILE("stdint.h" HAVE_STDINT_H) CHECK_INCLUDE_FILE("stdint.h" HAVE_STDINT_H)
CHECK_INCLUDE_FILE("inttypes.h" HAVE_INTTYPES_H) CHECK_INCLUDE_FILE("inttypes.h" HAVE_INTTYPES_H)
CONFIGURE_FILE(${GD_SOURCE_DIR}/src/config.h.cmake ${GD_SOURCE_DIR}/src/c onfig.h ESCAPE_QUOTES) CONFIGURE_FILE(${GD_SOURCE_DIR}/src/config.h.cmake ${GD_SOURCE_DIR}/src/c onfig.h ESCAPE_QUOTES)
option(BUILD_SHARED_LIBS "Build shared libs" ON) option(BUILD_SHARED_LIBS "Build shared libs" ON)
 End of changes. 22 change blocks. 
12 lines changed or deleted 25 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)