diff options
Diffstat (limited to 'Build/source/libs/gd/libgd-src/CMakeLists.txt')
-rw-r--r-- | Build/source/libs/gd/libgd-src/CMakeLists.txt | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Build/source/libs/gd/libgd-src/CMakeLists.txt b/Build/source/libs/gd/libgd-src/CMakeLists.txt index 5bec7043208..d1c2fc1a458 100644 --- a/Build/source/libs/gd/libgd-src/CMakeLists.txt +++ b/Build/source/libs/gd/libgd-src/CMakeLists.txt @@ -9,6 +9,8 @@ PROJECT(GD) SET(CMAKE_MODULE_PATH "${GD_SOURCE_DIR}/cmake/modules") +include(gd) + OPTION(ENABLE_PNG "Enable PNG support" 0) OPTION(ENABLE_LIQ "Enable libimagequant support" 0) OPTION(ENABLE_JPEG "Enable JPEG support" 0) @@ -68,13 +70,13 @@ if (USE_EXT_GD) else (USE_EXT_GD) SET(GD_VERSION_MAJOR "2") - SET(GD_VERSION_MINOR "1") - SET(GD_VERSION_PATCH "1") + SET(GD_VERSION_MINOR "2") + SET(GD_VERSION_PATCH "3") SET(GD_VERSION_EXTRA "") SET(GD_VERSION "${GD_VERSION_MAJOR}.${GD_VERSION_MINOR}.${GD_VERSION_PATCH}${GD_VERSION_EXTRA}") SET(GD_VERSION_STRING "${GD_VERSION}") - SET(GD_VERSION_INT "20101") + SET(GD_VERSION_INT "2020333") SET(CMAKE_REQUIRED_INCLUDES "/usr/include" "/usr/local/include") @@ -95,7 +97,7 @@ else (USE_EXT_GD) FIND_PACKAGE(ZLIB) IF (ENABLE_WEBP) - FIND_PACKAGE(VPX) + FIND_PACKAGE(WEBP) ENDIF (ENABLE_WEBP) IF (ENABLE_LIQ) @@ -137,10 +139,10 @@ else (USE_EXT_GD) SET(HAVE_LIBZ 1) ENDIF(ZLIB_FOUND) - IF(VPX_FOUND) - INCLUDE_DIRECTORIES(${VPX_INCLUDE_DIR}) - SET(HAVE_LIBVPX 1) - ENDIF(VPX_FOUND) + IF(WEBP_FOUND) + INCLUDE_DIRECTORIES(${WEBP_INCLUDE_DIR}) + SET(HAVE_LIBWEBP 1) + ENDIF(WEBP_FOUND) IF(PNG_FOUND) INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR}) @@ -155,7 +157,7 @@ else (USE_EXT_GD) IF(LIQ_FOUND) INCLUDE_DIRECTORIES(${LIQ_INCLUDE_DIR}) - SET(HAVE_LIBIMAGEQUANT_H 1) + SET(HAVE_LIBIMAGEQUANT 1) ENDIF(LIQ_FOUND) IF(XPM_FOUND) @@ -191,8 +193,7 @@ else (USE_EXT_GD) CONFIGURE_FILE(${GD_SOURCE_DIR}/src/config.h.cmake ${GD_SOURCE_DIR}/src/config.h ESCAPE_QUOTES) - - set(BUILD_SHARED_LIBS On) + option(BUILD_SHARED_LIBS "Build both shared and static libs" ON) if (WIN32) SET(GD_LIB libgd) @@ -223,14 +224,13 @@ endif (USE_EXT_GD) add_subdirectory(tests) add_subdirectory(examples) -add_subdirectory(docs) SET(CPACK_PACKAGE_NAME "libgd") SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "libGD, powerful and easy to use graphic library") SET(CPACK_PACKAGE_VENDOR "http://www.libgd.org") SET(CPACK_PACKAGE_VERSION_MAJOR "2") -SET(CPACK_PACKAGE_VERSION_MINOR "1") -SET(CPACK_PACKAGE_VERSION_PATCH "0") +SET(CPACK_PACKAGE_VERSION_MINOR "2") +SET(CPACK_PACKAGE_VERSION_PATCH "3") if(WIN32) set(CPACK_GENERATOR ZIP) |