"Fossies" - the Fresh Open Source Software Archive  

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

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

[ To the main libgd source changes report ]

CMakeLists.txt  (libgd-2.3.2):CMakeLists.txt  (libgd-2.3.3)
skipping to change at line 25 skipping to change at line 25
OPTION(ENABLE_JPEG "Enable JPEG support" 0) OPTION(ENABLE_JPEG "Enable JPEG support" 0)
OPTION(ENABLE_TIFF "Enable TIFF support" 0) OPTION(ENABLE_TIFF "Enable TIFF support" 0)
OPTION(ENABLE_ICONV "Enable ICONV support" 0) OPTION(ENABLE_ICONV "Enable ICONV support" 0)
OPTION(ENABLE_XPM "Enable XPM support" 0) OPTION(ENABLE_XPM "Enable XPM support" 0)
OPTION(ENABLE_FREETYPE "Enable Freetype2 support" 0) OPTION(ENABLE_FREETYPE "Enable Freetype2 support" 0)
OPTION(ENABLE_FONTCONFIG "Enable FontConfig support" 0) OPTION(ENABLE_FONTCONFIG "Enable FontConfig support" 0)
OPTION(ENABLE_WEBP "Enable WebP support" 0) OPTION(ENABLE_WEBP "Enable WebP support" 0)
OPTION(ENABLE_HEIF "Enable HEIF support" 0) OPTION(ENABLE_HEIF "Enable HEIF support" 0)
OPTION(ENABLE_AVIF "Enable AVIF support" 0) OPTION(ENABLE_AVIF "Enable AVIF support" 0)
OPTION(ENABLE_RAQM "Enable RAQM support" 0) OPTION(ENABLE_RAQM "Enable RAQM support" 0)
OPTION(ENABLE_ASAN "Enable (gcc) ASAN support" 0)
OPTION(ENABLE_CPP "Enable CPP GD API" 1)
OPTION(VERBOSE_MAKEFILE "Enable CMAKE_VERBOSE_MAKEFILE" 0)
if (VERBOSE_MAKEFILE)
set(CMAKE_VERBOSE_MAKEFILE ON)
endif (VERBOSE_MAKEFILE)
if (BUILD_TEST) if (BUILD_TEST)
ENABLE_TESTING() ENABLE_TESTING()
endif(BUILD_TEST) endif(BUILD_TEST)
# if you would like to pass C flags to the compiler, then just # if you would like to pass C flags to the compiler, then just
# - specify -DCMAKE_C_FLAGS=... on invocation of cmake, or # - specify -DCMAKE_C_FLAGS=... on invocation of cmake, or
# - specify CFLAGS=... on invocation of make # - specify CFLAGS=... on invocation of make
IF(CMAKE_COMPILER_IS_GNUCC) IF(CMAKE_COMPILER_IS_GNUCC)
SET(CMAKE_C_FLAGS_DEBUG "-g -Wall -Wextra -O0") # will be added to CMAKE_C_FLA # Re-enable sanitize once we find a way to filter out errors in external libra
GS when CMAKE_BUILD_TYPE is "Debug" ries (like HEIF)
if (ENABLE_ASAN)
SET(CMAKE_C_FLAGS_DEBUG "-g -Wall -Wextra -O0 -fsanitize=address") # will
be added to CMAKE_C_FLAGS when CMAKE_BUILD_TYPE is Debug
else (ENABLE_ASAN)
SET(CMAKE_C_FLAGS_DEBUG "-g -Wall -Wextra -O0 ") # will be added to CMAKE
_C_FLAGS when CMAKE_BUILD_TYPE is Debug
endif (ENABLE_ASAN)
ENDIF(CMAKE_COMPILER_IS_GNUCC) ENDIF(CMAKE_COMPILER_IS_GNUCC)
SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY
${PROJECT_BINARY_DIR}/Bin ${PROJECT_BINARY_DIR}/Bin
CACHE PATH CACHE PATH
"Single Directory for all Libraries" "Single Directory for all Libraries"
) )
# --------- Setup the Executable output Directory ------------- # --------- Setup the Executable output Directory -------------
SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY
${PROJECT_BINARY_DIR}/Bin ${PROJECT_BINARY_DIR}/Bin
skipping to change at line 78 skipping to change at line 90
message("GD libs #: ${GD_LIBRARIES}") message("GD libs #: ${GD_LIBRARIES}")
message("GD lib #: ${GD_LIBRARY}") message("GD lib #: ${GD_LIBRARY}")
message("GD include: ${GD_INCLUDE_DIR}") message("GD include: ${GD_INCLUDE_DIR}")
else (GD_FOUND) else (GD_FOUND)
message("No gd found") message("No gd found")
endif (GD_FOUND) endif (GD_FOUND)
else (USE_EXT_GD) else (USE_EXT_GD)
MACRO(GV VER VAR) MACRO(GV VER VAR)
execute_process( execute_process(
COMMAND perl ${CMAKE_CURRENT_SOURCE_DIR}/config/getver.pl ${VER} COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/config/getver.sh ${VE R}
OUTPUT_VARIABLE ${VAR} OUTPUT_VARIABLE ${VAR}
) )
ENDMACRO(GV) ENDMACRO(GV)
GV(MAJOR GDLIB_MAJOR) GV(MAJOR GDLIB_MAJOR)
GV(MINOR GDLIB_MINOR) GV(MINOR GDLIB_MINOR)
GV(RELEASE GDLIB_REVISION) GV(RELEASE GDLIB_REVISION)
GV(EXTRA GDLIB_EXTRA) GV(EXTRA GDLIB_EXTRA)
SET(GDLIB_VERSION "${GDLIB_MAJOR}.${GDLIB_MINOR}.${GDLIB_REVISION}${GDLIB _EXTRA}") SET(GDLIB_VERSION "${GDLIB_MAJOR}.${GDLIB_MINOR}.${GDLIB_REVISION}${GDLIB _EXTRA}")
MESSAGE(STATUS "gd version ${GDLIB_VERSION}") MESSAGE(STATUS "gd version ${GDLIB_VERSION}")
skipping to change at line 107 skipping to change at line 119
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})")
include(CheckIncludeFiles) include(CheckIncludeFiles)
include(CheckIncludeFile) include(CheckIncludeFile)
include(AC_HEADER_STDC) include(AC_HEADER_STDC)
include(CheckPrototypeExists) include(CheckPrototypeExists)
if (ENABLE_CPP)
SET(ENABLE_CPP_API 1)
endif (ENABLE_CPP)
if (ENABLE_GD_FORMATS) if (ENABLE_GD_FORMATS)
FIND_PACKAGE(ZLIB REQUIRED) FIND_PACKAGE(ZLIB REQUIRED)
endif (ENABLE_GD_FORMATS) endif (ENABLE_GD_FORMATS)
if (ENABLE_PNG) if (ENABLE_PNG)
FIND_PACKAGE(ZLIB REQUIRED) FIND_PACKAGE(ZLIB REQUIRED)
FIND_PACKAGE(PNG REQUIRED) FIND_PACKAGE(PNG REQUIRED)
endif (ENABLE_PNG) endif (ENABLE_PNG)
if (ENABLE_ICONV) if (ENABLE_ICONV)
skipping to change at line 251 skipping to change at line 267
ENDIF(RAQM_FOUND) ENDIF(RAQM_FOUND)
string(REPLACE ";" ", " PKG_REQUIRES_PRIVATES "${PKG_REQUIRES_PRIVATES}") 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 CONFIGURE_FILE(${GD_SOURCE_DIR}/src/config.h.cmake ${CMAKE_CURRENT_BINARY
onfig.h ESCAPE_QUOTES) _DIR}/src/config.h ESCAPE_QUOTES)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/src)
option(BUILD_SHARED_LIBS "Build shared libs" ON) option(BUILD_SHARED_LIBS "Build shared libs" ON)
option(BUILD_STATIC_LIBS "Build static libs" OFF) option(BUILD_STATIC_LIBS "Build static libs" OFF)
if (WIN32) if (WIN32)
SET(GD_LIB libgd) SET(GD_LIB libgd)
ADD_DEFINITIONS( -DWIN32 -D_WIN32 -DMSWIN32 -DBGDWIN32 -DWINVER=0 x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0600) ADD_DEFINITIONS( -DWIN32 -D_WIN32 -DMSWIN32 -DBGDWIN32 -DWINVER=0 x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0600)
if(NOT MINGW AND MSVC_VERSION GREATER 1399) if(NOT MINGW AND MSVC_VERSION GREATER 1399)
ADD_DEFINITIONS("/D_CRT_SECURE_NO_DEPRECATE") ADD_DEFINITIONS("/D_CRT_SECURE_NO_DEPRECATE")
endif(NOT MINGW AND MSVC_VERSION GREATER 1399) endif(NOT MINGW AND MSVC_VERSION GREATER 1399)
if (MINGW OR MSYS) if (MINGW OR MSYS)
SET(GD_LIB gd)
ADD_DEFINITIONS("-mms-bitfields") # -m32 ADD_DEFINITIONS("-mms-bitfields") # -m32
endif (MINGW OR MSYS) endif (MINGW OR MSYS)
else (WIN32) else (WIN32)
SET(GD_LIB gd) SET(GD_LIB gd)
endif (WIN32) endif (WIN32)
SET(GD_LIB_STATIC "${GD_LIB}_static") SET(GD_LIB_STATIC "${GD_LIB}_static")
IF(PROFILE) IF(PROFILE)
add_definitions("-pg") add_definitions("-pg")
skipping to change at line 285 skipping to change at line 303
ENDIF(PROFILE) ENDIF(PROFILE)
SET(GD_INCLUDE_DIR "${GD_SOURCE_DIR}/src" "${GD_SOURCE_DIR}") SET(GD_INCLUDE_DIR "${GD_SOURCE_DIR}/src" "${GD_SOURCE_DIR}")
INCLUDE_DIRECTORIES(before ${FONTCONFIG_INCLUDE_DIR}) INCLUDE_DIRECTORIES(before ${FONTCONFIG_INCLUDE_DIR})
add_subdirectory(src) add_subdirectory(src)
endif (USE_EXT_GD) endif (USE_EXT_GD)
add_subdirectory(tests) add_subdirectory(tests)
add_subdirectory(examples) add_subdirectory(examples)
add_subdirectory(docs)
add_custom_target(distclean ${GD_SOURCE_DIR}/cmake/distclean.sh) add_custom_target(distclean ${GD_SOURCE_DIR}/cmake/distclean.sh)
SET(CPACK_PACKAGE_NAME "libgd") SET(CPACK_PACKAGE_NAME "libgd")
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "libGD, powerful and easy to use graphic l ibrary") SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "libGD, powerful and easy to use graphic l ibrary")
SET(CPACK_PACKAGE_VENDOR "https://www.libgd.org") SET(CPACK_PACKAGE_VENDOR "https://www.libgd.org")
SET(CPACK_PACKAGE_VERSION_MAJOR ${GDLIB_MAJOR}) SET(CPACK_PACKAGE_VERSION_MAJOR ${GDLIB_MAJOR})
SET(CPACK_PACKAGE_VERSION_MINOR ${GDLIB_MINOR}) SET(CPACK_PACKAGE_VERSION_MINOR ${GDLIB_MINOR})
SET(CPACK_PACKAGE_VERSION_PATCH ${GDLIB_REVISION}${GDLIB_EXTRA}) SET(CPACK_PACKAGE_VERSION_PATCH ${GDLIB_REVISION}${GDLIB_EXTRA})
 End of changes. 7 change blocks. 
5 lines changed or deleted 26 lines changed or added
To the CMake Files section of the libgd source changes report or the top of this page
Mainly generated by pkgdiff using rfcdiff
Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)