dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-04-11 19:36:47 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmake,cosmetics: apply cmake-format

Browse Source 
using the defaults present in 0.6.13 and setting
--first-comment-is-literal to avoid reflowing the copyright block and
--max-subgroups-hwrap 3 (default is 2) to avoid making some short set()
statements multi-line.

Change-Id: I77ec1f05a819f09c0143d6069c56b6e771ac6a37
This commit is contained in:
James Zern 2022-08-17 12:33:17 -07:00
parent 0dd49d1a3a
commit 15a91ab179
3 changed files with 181 additions and 255 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

358
CMakeLists.txt
View File

@ -54,9 +54,9 @@ set_property(CACHE WEBP_BITTRACE PROPERTY STRINGS 0 1 2)
if(WEBP_LINK_STATIC) if(WEBP_LINK_STATIC)
if(WIN32) if(WIN32)
SET(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES}) set(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
else() else()
SET(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES}) set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
endif() endif()
set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON)
# vwebp does not compile on Ubuntu with static libraries so disabling it for # vwebp does not compile on Ubuntu with static libraries so disabling it for
@ -92,7 +92,7 @@ set(WEBP_DEP_INCLUDE_DIRS)
if(NOT CMAKE_BUILD_TYPE) if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Release" set(CMAKE_BUILD_TYPE "Release"
CACHE STRING "Build type: Release, Debug, MinSizeRel or RelWithDebInfo" CACHE STRING "Build type: Release, Debug, MinSizeRel or RelWithDebInfo"
FORCE) FORCE)
endif() endif()
# Include dependencies. # Include dependencies.
@ -150,7 +150,7 @@ if(ANDROID)
target_link_libraries(cpufeatures dl) target_link_libraries(cpufeatures dl)
set(WEBP_DEP_LIBRARIES ${WEBP_DEP_LIBRARIES} cpufeatures) set(WEBP_DEP_LIBRARIES ${WEBP_DEP_LIBRARIES} cpufeatures)
set(WEBP_DEP_INCLUDE_DIRS ${WEBP_DEP_INCLUDE_DIRS} set(WEBP_DEP_INCLUDE_DIRS ${WEBP_DEP_INCLUDE_DIRS}
${ANDROID_NDK}/sources/android/cpufeatures) ${ANDROID_NDK}/sources/android/cpufeatures)
add_definitions(-DHAVE_CPU_FEATURES_H=1) add_definitions(-DHAVE_CPU_FEATURES_H=1)
set(HAVE_CPU_FEATURES_H 1) set(HAVE_CPU_FEATURES_H 1)
else() else()
@ -168,10 +168,8 @@ function(configure_pkg_config FILE)
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${FILE} ${data}) file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${FILE} ${data})
endif() endif()
install( install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${FILE}"
FILES "${CMAKE_CURRENT_BINARY_DIR}/${FILE}" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
)
endfunction() endfunction()
# ############################################################################## # ##############################################################################
@ -181,23 +179,15 @@ endfunction()
# E.g.: libimagedec_la_SOURCES = image_dec.c image_dec.h # E.g.: libimagedec_la_SOURCES = image_dec.c image_dec.h
function(parse_Makefile_am FOLDER VAR SRC_REGEX) function(parse_Makefile_am FOLDER VAR SRC_REGEX)
file(READ ${FOLDER}/Makefile.am MAKEFILE_AM) file(READ ${FOLDER}/Makefile.am MAKEFILE_AM)
string(REGEX MATCHALL string(REGEX MATCHALL "${SRC_REGEX}_SOURCES[ ]*\\+?=[ ]+[0-9a-z\\._ ]*"
"${SRC_REGEX}_SOURCES[ ]*\\+?=[ ]+[0-9a-z\\._ ]*" FILES_PER_LINE ${MAKEFILE_AM})
FILES_PER_LINE
${MAKEFILE_AM})
set(SRCS ${${VAR}}) set(SRCS ${${VAR}})
foreach(FILES ${FILES_PER_LINE}) foreach(FILES ${FILES_PER_LINE})
string(FIND ${FILES} "=" OFFSET) string(FIND ${FILES} "=" OFFSET)
math(EXPR OFFSET "${OFFSET} + 2") math(EXPR OFFSET "${OFFSET} + 2")
string(SUBSTRING ${FILES} string(SUBSTRING ${FILES} ${OFFSET} -1 FILES)
${OFFSET}
-1
FILES)
if(FILES) if(FILES)
string(REGEX MATCHALL string(REGEX MATCHALL "[0-9a-z\\._]+" FILES ${FILES})
"[0-9a-z\\._]+"
FILES
${FILES})
foreach(FILE ${FILES}) foreach(FILE ${FILES})
list(APPEND SRCS ${FOLDER}/${FILE}) list(APPEND SRCS ${FOLDER}/${FILE})
endforeach() endforeach()
@ -233,18 +223,10 @@ add_definitions(-DHAVE_CONFIG_H)
macro(set_version FILE TARGET_NAME NAME_IN_MAKEFILE) macro(set_version FILE TARGET_NAME NAME_IN_MAKEFILE)
file(READ ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} SOURCE_FILE) file(READ ${CMAKE_CURRENT_SOURCE_DIR}/${FILE} SOURCE_FILE)
string(REGEX MATCH string(REGEX MATCH
"${NAME_IN_MAKEFILE}_la_LDFLAGS[^\n]* -version-info [0-9:]+" "${NAME_IN_MAKEFILE}_la_LDFLAGS[^\n]* -version-info [0-9:]+" TMP
TMP
${SOURCE_FILE}) ${SOURCE_FILE})
string(REGEX MATCH string(REGEX MATCH "[0-9:]+" TMP ${TMP})
"[0-9:]+" string(REGEX REPLACE ":" " " LT_VERSION ${TMP})
TMP
${TMP})
string(REGEX
REPLACE ":"
" "
LT_VERSION
${TMP})
# See the libtool docs for more information: # See the libtool docs for more information:
# https://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info # https://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
@ -263,10 +245,8 @@ macro(set_version FILE TARGET_NAME NAME_IN_MAKEFILE)
set_target_properties( set_target_properties(
${TARGET_NAME} ${TARGET_NAME}
PROPERTIES VERSION PROPERTIES VERSION ${LT_CURRENT_MINUS_AGE}.${LT_AGE}.${LT_REVISION}
${LT_CURRENT_MINUS_AGE}.${LT_AGE}.${LT_REVISION} SOVERSION ${LT_CURRENT_MINUS_AGE})
SOVERSION
${LT_CURRENT_MINUS_AGE})
if(APPLE) if(APPLE)
# For compatibility, set MACHO_COMPATIBILITY_VERSION and # For compatibility, set MACHO_COMPATIBILITY_VERSION and
# MACHO_CURRENT_VERSION to match libtool. These properties were introduced # MACHO_CURRENT_VERSION to match libtool. These properties were introduced
@ -290,13 +270,12 @@ endmacro()
# #
# See also: # See also:
# https://cmake.org/cmake/help/v3.18/command/add_library.html#object-libraries # https://cmake.org/cmake/help/v3.18/command/add_library.html#object-libraries
# "Some native build systems (such as Xcode) may not like targets that have # "Some native build systems (such as Xcode) may not like targets that have only
# only object files, so consider adding at least one real source file to any # object files, so consider adding at least one real source file to any target
# target that references $<TARGET_OBJECTS:objlib>." # that references $<TARGET_OBJECTS:objlib>."
function(libwebp_add_stub_file TARGET) function(libwebp_add_stub_file TARGET)
set(stub_source_dir "${CMAKE_BINARY_DIR}") set(stub_source_dir "${CMAKE_BINARY_DIR}")
set(stub_source_file set(stub_source_file "${stub_source_dir}/libwebp_${TARGET}_stub.c")
"${stub_source_dir}/libwebp_${TARGET}_stub.c")
set(stub_source_code set(stub_source_code
"// Generated file. DO NOT EDIT!\n" "// Generated file. DO NOT EDIT!\n"
"// C source file created for target ${TARGET}.\n" "// C source file created for target ${TARGET}.\n"
@ -307,27 +286,27 @@ function(libwebp_add_stub_file TARGET)
target_sources(${TARGET} PRIVATE ${stub_source_file}) target_sources(${TARGET} PRIVATE ${stub_source_file})
endfunction() endfunction()
parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/sharpyuv "WEBP_SHARPYUV_SRCS" parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/sharpyuv "WEBP_SHARPYUV_SRCS" "")
"")
add_library(sharpyuv ${WEBP_SHARPYUV_SRCS}) add_library(sharpyuv ${WEBP_SHARPYUV_SRCS})
set_version(sharpyuv/Makefile.am sharpyuv sharpyuv) set_version(sharpyuv/Makefile.am sharpyuv sharpyuv)
target_include_directories(sharpyuv target_include_directories(
PRIVATE ${CMAKE_CURRENT_BINARY_DIR} sharpyuv PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src)
${CMAKE_CURRENT_SOURCE_DIR}/src)
set_target_properties( set_target_properties(
sharpyuv sharpyuv
PROPERTIES PUBLIC_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/sharpyuv/sharpyuv.h;\ PROPERTIES PUBLIC_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/sharpyuv/sharpyuv.h;\
${CMAKE_CURRENT_SOURCE_DIR}/sharpyuv/sharpyuv_csp.h") ${CMAKE_CURRENT_SOURCE_DIR}/sharpyuv/sharpyuv_csp.h")
configure_pkg_config("sharpyuv/libsharpyuv.pc") configure_pkg_config("sharpyuv/libsharpyuv.pc")
install(TARGETS sharpyuv install(
EXPORT ${PROJECT_NAME}Targets TARGETS sharpyuv
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/webp/sharpyuv EXPORT ${PROJECT_NAME}Targets
INCLUDES PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/webp/sharpyuv
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ${CMAKE_INSTALL_INCLUDEDIR}/webp INCLUDES
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ${CMAKE_INSTALL_INCLUDEDIR}/webp
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
if(MSVC) if(MSVC)
# avoid security warnings for e.g., fopen() used in the examples. # avoid security warnings for e.g., fopen() used in the examples.
@ -337,31 +316,24 @@ else()
endif() endif()
include_directories(${WEBP_DEP_INCLUDE_DIRS}) include_directories(${WEBP_DEP_INCLUDE_DIRS})
add_library(webpdecode OBJECT ${WEBP_DEC_SRCS}) add_library(webpdecode OBJECT ${WEBP_DEC_SRCS})
target_include_directories(webpdecode target_include_directories(webpdecode PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
${CMAKE_CURRENT_SOURCE_DIR})
add_library(webpdspdecode OBJECT ${WEBP_DSP_COMMON_SRCS} ${WEBP_DSP_DEC_SRCS}) add_library(webpdspdecode OBJECT ${WEBP_DSP_COMMON_SRCS} ${WEBP_DSP_DEC_SRCS})
target_include_directories(webpdspdecode target_include_directories(webpdspdecode PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
${CMAKE_CURRENT_SOURCE_DIR}) add_library(webputilsdecode OBJECT ${WEBP_UTILS_COMMON_SRCS}
add_library(webputilsdecode ${WEBP_UTILS_DEC_SRCS})
OBJECT target_include_directories(webputilsdecode PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
${WEBP_UTILS_COMMON_SRCS} ${CMAKE_CURRENT_SOURCE_DIR})
${WEBP_UTILS_DEC_SRCS}) add_library(
target_include_directories(webputilsdecode webpdecoder $<TARGET_OBJECTS:webpdecode> $<TARGET_OBJECTS:webpdspdecode>
PRIVATE ${CMAKE_CURRENT_BINARY_DIR} $<TARGET_OBJECTS:webputilsdecode>)
${CMAKE_CURRENT_SOURCE_DIR})
add_library(webpdecoder
$<TARGET_OBJECTS:webpdecode>
$<TARGET_OBJECTS:webpdspdecode>
$<TARGET_OBJECTS:webputilsdecode>)
if(XCODE) if(XCODE)
libwebp_add_stub_file(webpdecoder) libwebp_add_stub_file(webpdecoder)
endif() endif()
target_link_libraries(webpdecoder ${WEBP_DEP_LIBRARIES}) target_link_libraries(webpdecoder ${WEBP_DEP_LIBRARIES})
target_include_directories( target_include_directories(
webpdecoder webpdecoder PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
set_target_properties( set_target_properties(
@ -373,40 +345,26 @@ configure_pkg_config("src/libwebpdecoder.pc")
# Build the webp library. # Build the webp library.
add_library(webpencode OBJECT ${WEBP_ENC_SRCS}) add_library(webpencode OBJECT ${WEBP_ENC_SRCS})
target_include_directories(webpencode target_include_directories(
PRIVATE ${CMAKE_CURRENT_BINARY_DIR} webpencode PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src)
${CMAKE_CURRENT_SOURCE_DIR}/src) add_library(webpdsp OBJECT ${WEBP_DSP_COMMON_SRCS} ${WEBP_DSP_DEC_SRCS}
add_library(webpdsp ${WEBP_DSP_ENC_SRCS})
OBJECT target_include_directories(webpdsp PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
${WEBP_DSP_COMMON_SRCS} ${CMAKE_CURRENT_SOURCE_DIR})
${WEBP_DSP_DEC_SRCS} add_library(webputils OBJECT ${WEBP_UTILS_COMMON_SRCS} ${WEBP_UTILS_DEC_SRCS}
${WEBP_DSP_ENC_SRCS}) ${WEBP_UTILS_ENC_SRCS})
target_include_directories(webpdsp target_include_directories(webputils PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
${CMAKE_CURRENT_SOURCE_DIR}) add_library(webp $<TARGET_OBJECTS:webpdecode> $<TARGET_OBJECTS:webpdsp>
add_library(webputils $<TARGET_OBJECTS:webpencode> $<TARGET_OBJECTS:webputils>)
OBJECT
${WEBP_UTILS_COMMON_SRCS}
${WEBP_UTILS_DEC_SRCS}
${WEBP_UTILS_ENC_SRCS})
target_include_directories(webputils
PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR})
add_library(webp
$<TARGET_OBJECTS:webpdecode>
$<TARGET_OBJECTS:webpdsp>
$<TARGET_OBJECTS:webpencode>
$<TARGET_OBJECTS:webputils>)
target_link_libraries(webp sharpyuv) target_link_libraries(webp sharpyuv)
if(XCODE) if(XCODE)
libwebp_add_stub_file(webp) libwebp_add_stub_file(webp)
endif() endif()
target_link_libraries(webp ${WEBP_DEP_LIBRARIES}) target_link_libraries(webp ${WEBP_DEP_LIBRARIES})
target_include_directories( target_include_directories(
webp webp PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src> PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
$<INSTALL_INTERFACE:include>) $<INSTALL_INTERFACE:include>)
set_target_properties( set_target_properties(
@ -417,25 +375,21 @@ ${CMAKE_CURRENT_SOURCE_DIR}/src/webp/types.h")
# Make sure the OBJECT libraries are built with position independent code (it is # Make sure the OBJECT libraries are built with position independent code (it is
# not ON by default). # not ON by default).
set_target_properties(webpdecode set_target_properties(webpdecode webpdspdecode webputilsdecode webpencode
webpdspdecode webpdsp webputils PROPERTIES POSITION_INDEPENDENT_CODE ON)
webputilsdecode
webpencode
webpdsp
webputils
PROPERTIES POSITION_INDEPENDENT_CODE ON)
configure_pkg_config("src/libwebp.pc") configure_pkg_config("src/libwebp.pc")
# Build the webp demux library. # Build the webp demux library.
add_library(webpdemux ${WEBP_DEMUX_SRCS}) add_library(webpdemux ${WEBP_DEMUX_SRCS})
target_link_libraries(webpdemux webp) target_link_libraries(webpdemux webp)
target_include_directories(webpdemux target_include_directories(
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} webpdemux PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR} PUBLIC $<INSTALL_INTERFACE:include>)
PUBLIC $<INSTALL_INTERFACE:include>)
set_target_properties( set_target_properties(
webpdemux webpdemux
PROPERTIES PUBLIC_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/src/webp/decode.h;\ PROPERTIES
PUBLIC_HEADER
"${CMAKE_CURRENT_SOURCE_DIR}/src/webp/decode.h;\
${CMAKE_CURRENT_SOURCE_DIR}/src/webp/demux.h;\ ${CMAKE_CURRENT_SOURCE_DIR}/src/webp/demux.h;\
${CMAKE_CURRENT_SOURCE_DIR}/src/webp/mux_types.h;\ ${CMAKE_CURRENT_SOURCE_DIR}/src/webp/mux_types.h;\
${CMAKE_CURRENT_SOURCE_DIR}/src/webp/types.h") ${CMAKE_CURRENT_SOURCE_DIR}/src/webp/types.h")
@ -446,14 +400,8 @@ set_version(src/Makefile.am webp webp)
set_version(src/Makefile.am webpdecoder webpdecoder) set_version(src/Makefile.am webpdecoder webpdecoder)
set_version(src/demux/Makefile.am webpdemux webpdemux) set_version(src/demux/Makefile.am webpdemux webpdemux)
file(READ ${CMAKE_CURRENT_SOURCE_DIR}/configure.ac CONFIGURE_FILE) file(READ ${CMAKE_CURRENT_SOURCE_DIR}/configure.ac CONFIGURE_FILE)
string(REGEX MATCH string(REGEX MATCH "AC_INIT\\([^\n]*\\[[0-9\\.]+\\]" TMP ${CONFIGURE_FILE})
"AC_INIT\\([^\n]*\\[[0-9\\.]+\\]" string(REGEX MATCH "[0-9\\.]+" PROJECT_VERSION ${TMP})
TMP
${CONFIGURE_FILE})
string(REGEX MATCH
"[0-9\\.]+"
PROJECT_VERSION
${TMP})
# Define the libraries to install. # Define the libraries to install.
list(APPEND INSTALLED_LIBRARIES webpdecoder webp webpdemux) list(APPEND INSTALLED_LIBRARIES webpdecoder webp webpdemux)
@ -466,10 +414,8 @@ math(EXPR WEBP_SIMD_FILES_TO_INCLUDE_RANGE
foreach(I_FILE RANGE ${WEBP_SIMD_FILES_TO_INCLUDE_RANGE}) foreach(I_FILE RANGE ${WEBP_SIMD_FILES_TO_INCLUDE_RANGE})
list(GET WEBP_SIMD_FILES_TO_INCLUDE ${I_FILE} FILE) list(GET WEBP_SIMD_FILES_TO_INCLUDE ${I_FILE} FILE)
list(GET WEBP_SIMD_FLAGS_TO_INCLUDE ${I_FILE} SIMD_COMPILE_FLAG) list(GET WEBP_SIMD_FLAGS_TO_INCLUDE ${I_FILE} SIMD_COMPILE_FLAG)
set_source_files_properties(${FILE} set_source_files_properties(${FILE} PROPERTIES COMPILE_FLAGS
PROPERTIES ${SIMD_COMPILE_FLAG})
COMPILE_FLAGS
${SIMD_COMPILE_FLAG})
endforeach() endforeach()
if(NOT WEBP_BUILD_LIBWEBPMUX) if(NOT WEBP_BUILD_LIBWEBPMUX)
@ -501,8 +447,7 @@ if(WEBP_BUILD_ANIM_UTILS
list(APPEND EXAMPLEUTIL_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/examples/stopwatch.h) list(APPEND EXAMPLEUTIL_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/examples/stopwatch.h)
add_library(exampleutil STATIC ${EXAMPLEUTIL_SRCS}) add_library(exampleutil STATIC ${EXAMPLEUTIL_SRCS})
target_include_directories( target_include_directories(
exampleutil exampleutil PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>)
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>)
parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/imageio "IMAGEIOUTILS_SRCS" parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/imageio "IMAGEIOUTILS_SRCS"
"imageio_util_[^ ]*") "imageio_util_[^ ]*")
@ -514,10 +459,7 @@ if(WEBP_BUILD_ANIM_UTILS
parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/imageio "IMAGEDEC_SRCS" parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/imageio "IMAGEDEC_SRCS"
"imagedec_[^ ]*") "imagedec_[^ ]*")
add_library(imagedec STATIC ${IMAGEDEC_SRCS}) add_library(imagedec STATIC ${IMAGEDEC_SRCS})
target_link_libraries(imagedec target_link_libraries(imagedec imageioutil webpdemux webp
imageioutil
webpdemux
webp
${WEBP_DEP_IMG_LIBRARIES}) ${WEBP_DEP_IMG_LIBRARIES})
# Image-encoding utility library. # Image-encoding utility library.
@ -526,12 +468,10 @@ if(WEBP_BUILD_ANIM_UTILS
add_library(imageenc STATIC ${IMAGEENC_SRCS}) add_library(imageenc STATIC ${IMAGEENC_SRCS})
target_link_libraries(imageenc imageioutil webp) target_link_libraries(imageenc imageioutil webp)
set_property(TARGET exampleutil set_property(
imageioutil TARGET exampleutil imageioutil imagedec imageenc
imagedec PROPERTY INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}/src
imageenc ${CMAKE_CURRENT_BINARY_DIR}/src)
PROPERTY INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}/src
${CMAKE_CURRENT_BINARY_DIR}/src)
endif() endif()
if(WEBP_BUILD_DWEBP) if(WEBP_BUILD_DWEBP)
@ -556,13 +496,12 @@ if(WEBP_BUILD_LIBWEBPMUX)
parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/src/mux "WEBP_MUX_SRCS" "") parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/src/mux "WEBP_MUX_SRCS" "")
add_library(libwebpmux ${WEBP_MUX_SRCS}) add_library(libwebpmux ${WEBP_MUX_SRCS})
target_link_libraries(libwebpmux webp) target_link_libraries(libwebpmux webp)
target_include_directories(libwebpmux target_include_directories(libwebpmux PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
${CMAKE_CURRENT_SOURCE_DIR})
set_version(src/mux/Makefile.am libwebpmux webpmux) set_version(src/mux/Makefile.am libwebpmux webpmux)
set_target_properties(libwebpmux set_target_properties(
PROPERTIES PUBLIC_HEADER libwebpmux
"${CMAKE_CURRENT_SOURCE_DIR}/src/webp/mux.h;\ PROPERTIES PUBLIC_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/src/webp/mux.h;\
${CMAKE_CURRENT_SOURCE_DIR}/src/webp/mux_types.h;\ ${CMAKE_CURRENT_SOURCE_DIR}/src/webp/mux_types.h;\
${CMAKE_CURRENT_SOURCE_DIR}/src/webp/types.h;") ${CMAKE_CURRENT_SOURCE_DIR}/src/webp/types.h;")
set_target_properties(libwebpmux PROPERTIES OUTPUT_NAME webpmux) set_target_properties(libwebpmux PROPERTIES OUTPUT_NAME webpmux)
@ -576,11 +515,7 @@ if(WEBP_BUILD_GIF2WEBP)
parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/examples "GIF2WEBP_SRCS" parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/examples "GIF2WEBP_SRCS"
"gif2webp") "gif2webp")
add_executable(gif2webp ${GIF2WEBP_SRCS}) add_executable(gif2webp ${GIF2WEBP_SRCS})
target_link_libraries(gif2webp target_link_libraries(gif2webp exampleutil imageioutil webp libwebpmux
exampleutil
imageioutil
webp
libwebpmux
${WEBP_DEP_GIF_LIBRARIES}) ${WEBP_DEP_GIF_LIBRARIES})
target_include_directories(gif2webp PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src) target_include_directories(gif2webp PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
install(TARGETS gif2webp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) install(TARGETS gif2webp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
@ -592,11 +527,7 @@ if(WEBP_BUILD_IMG2WEBP)
parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/examples "IMG2WEBP_SRCS" parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/examples "IMG2WEBP_SRCS"
"img2webp") "img2webp")
add_executable(img2webp ${IMG2WEBP_SRCS}) add_executable(img2webp ${IMG2WEBP_SRCS})
target_link_libraries(img2webp target_link_libraries(img2webp exampleutil imagedec imageioutil webp
exampleutil
imagedec
imageioutil
webp
libwebpmux) libwebpmux)
target_include_directories(img2webp PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src) target_include_directories(img2webp PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
install(TARGETS img2webp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) install(TARGETS img2webp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
@ -609,17 +540,17 @@ if(WEBP_BUILD_VWEBP)
include_directories(${WEBP_DEP_IMG_INCLUDE_DIRS}) include_directories(${WEBP_DEP_IMG_INCLUDE_DIRS})
parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/examples "VWEBP_SRCS" "vwebp") parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/examples "VWEBP_SRCS" "vwebp")
add_executable(vwebp ${VWEBP_SRCS}) add_executable(vwebp ${VWEBP_SRCS})
target_link_libraries(vwebp target_link_libraries(
${OPENGL_LIBRARIES} vwebp
exampleutil ${OPENGL_LIBRARIES}
${GLUT_glut_LIBRARY} exampleutil
imageioutil ${GLUT_glut_LIBRARY}
webp imageioutil
webpdemux) webp
target_include_directories(vwebp webpdemux)
PRIVATE ${GLUT_INCLUDE_DIR} target_include_directories(
${CMAKE_CURRENT_BINARY_DIR}/src vwebp PRIVATE ${GLUT_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/src
${OPENGL_INCLUDE_DIR}) ${OPENGL_INCLUDE_DIR})
install(TARGETS vwebp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) install(TARGETS vwebp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
check_c_compiler_flag("-Wno-deprecated-declarations" HAS_NO_DEPRECATED) check_c_compiler_flag("-Wno-deprecated-declarations" HAS_NO_DEPRECATED)
@ -637,9 +568,8 @@ if(WEBP_BUILD_WEBPINFO)
"webpinfo") "webpinfo")
add_executable(webpinfo ${WEBPINFO_SRCS}) add_executable(webpinfo ${WEBPINFO_SRCS})
target_link_libraries(webpinfo exampleutil imageioutil) target_link_libraries(webpinfo exampleutil imageioutil)
target_include_directories(webpinfo target_include_directories(webpinfo PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src
PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/src)
${CMAKE_CURRENT_SOURCE_DIR}/src)
install(TARGETS webpinfo RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) install(TARGETS webpinfo RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif() endif()
@ -662,35 +592,30 @@ if(WEBP_BUILD_EXTRAS)
# libextras # libextras
add_library(extras STATIC ${WEBP_EXTRAS_SRCS}) add_library(extras STATIC ${WEBP_EXTRAS_SRCS})
target_include_directories(extras target_include_directories(
PRIVATE ${CMAKE_CURRENT_BINARY_DIR} extras PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src)
${CMAKE_CURRENT_SOURCE_DIR}/src)
# get_disto # get_disto
add_executable(get_disto ${GET_DISTO_SRCS}) add_executable(get_disto ${GET_DISTO_SRCS})
target_link_libraries(get_disto imagedec) target_link_libraries(get_disto imagedec)
target_include_directories(get_disto target_include_directories(get_disto PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/src)
${CMAKE_CURRENT_BINARY_DIR}/src)
# webp_quality # webp_quality
add_executable(webp_quality ${WEBP_QUALITY_SRCS}) add_executable(webp_quality ${WEBP_QUALITY_SRCS})
target_link_libraries(webp_quality exampleutil imagedec extras) target_link_libraries(webp_quality exampleutil imagedec extras)
target_include_directories(webp_quality target_include_directories(webp_quality PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
${CMAKE_CURRENT_BINARY_DIR})
# vwebp_sdl # vwebp_sdl
find_package(SDL) find_package(SDL)
if(WEBP_BUILD_VWEBP AND SDL_FOUND) if(WEBP_BUILD_VWEBP AND SDL_FOUND)
add_executable(vwebp_sdl ${VWEBP_SDL_SRCS}) add_executable(vwebp_sdl ${VWEBP_SDL_SRCS})
target_link_libraries(vwebp_sdl ${SDL_LIBRARY} imageioutil webp) target_link_libraries(vwebp_sdl ${SDL_LIBRARY} imageioutil webp)
target_include_directories(vwebp_sdl target_include_directories(
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} vwebp_sdl PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/src ${SDL_INCLUDE_DIR})
${CMAKE_CURRENT_BINARY_DIR}/src
${SDL_INCLUDE_DIR})
set(WEBP_HAVE_SDL 1) set(WEBP_HAVE_SDL 1)
target_compile_definitions(vwebp_sdl PUBLIC WEBP_HAVE_SDL) target_compile_definitions(vwebp_sdl PUBLIC WEBP_HAVE_SDL)
endif() endif()
@ -733,14 +658,15 @@ if(WEBP_BUILD_ANIM_UTILS)
parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/examples "ANIM_DIFF_SRCS" parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/examples "ANIM_DIFF_SRCS"
"anim_diff") "anim_diff")
add_executable(anim_diff ${ANIM_DIFF_SRCS}) add_executable(anim_diff ${ANIM_DIFF_SRCS})
target_link_libraries(anim_diff target_link_libraries(
exampleutil anim_diff
imagedec exampleutil
imageenc imagedec
imageioutil imageenc
webp imageioutil
webpdemux webp
${WEBP_DEP_GIF_LIBRARIES}) webpdemux
${WEBP_DEP_GIF_LIBRARIES})
target_include_directories(anim_diff PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src) target_include_directories(anim_diff PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
# anim_dump # anim_dump
@ -748,43 +674,43 @@ if(WEBP_BUILD_ANIM_UTILS)
parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/examples "ANIM_DUMP_SRCS" parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/examples "ANIM_DUMP_SRCS"
"anim_dump") "anim_dump")
add_executable(anim_dump ${ANIM_DUMP_SRCS}) add_executable(anim_dump ${ANIM_DUMP_SRCS})
target_link_libraries(anim_dump target_link_libraries(
exampleutil anim_dump
imagedec exampleutil
imageenc imagedec
imageioutil imageenc
webp imageioutil
webpdemux webp
${WEBP_DEP_GIF_LIBRARIES}) webpdemux
${WEBP_DEP_GIF_LIBRARIES})
target_include_directories(anim_dump PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src) target_include_directories(anim_dump PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
endif() endif()
# Install the different headers and libraries. # Install the different headers and libraries.
install(TARGETS ${INSTALLED_LIBRARIES} install(
EXPORT ${PROJECT_NAME}Targets TARGETS ${INSTALLED_LIBRARIES}
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/webp EXPORT ${PROJECT_NAME}Targets
INCLUDES PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/webp
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} INCLUDES
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
set(ConfigPackageLocation ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake/) set(ConfigPackageLocation ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake/)
install(EXPORT ${PROJECT_NAME}Targets install(EXPORT ${PROJECT_NAME}Targets NAMESPACE ${PROJECT_NAME}::
NAMESPACE ${PROJECT_NAME}::
DESTINATION ${ConfigPackageLocation}) DESTINATION ${ConfigPackageLocation})
# Create the CMake version file. # Create the CMake version file.
include(CMakePackageConfigHelpers) include(CMakePackageConfigHelpers)
write_basic_package_version_file( write_basic_package_version_file(
"${CMAKE_CURRENT_BINARY_DIR}/WebPConfigVersion.cmake" "${CMAKE_CURRENT_BINARY_DIR}/WebPConfigVersion.cmake"
VERSION ${PACKAGE_VERSION} VERSION ${PACKAGE_VERSION} COMPATIBILITY AnyNewerVersion)
COMPATIBILITY AnyNewerVersion)
# Create the Config file. # Create the Config file.
include(CMakePackageConfigHelpers) include(CMakePackageConfigHelpers)
# Fix libwebpmux reference. The target name libwebpmux is used for # Fix libwebpmux reference. The target name libwebpmux is used for compatibility
# compatibility purposes, but the library mentioned in WebPConfig.cmake should # purposes, but the library mentioned in WebPConfig.cmake should be the
# be the unprefixed version. # unprefixed version.
list(TRANSFORM INSTALLED_LIBRARIES REPLACE "libwebpmux" "webpmux") list(TRANSFORM INSTALLED_LIBRARIES REPLACE "libwebpmux" "webpmux")
if(MSVC) if(MSVC)
# For compatibility with nmake, MSVC builds use a custom prefix (lib) that # For compatibility with nmake, MSVC builds use a custom prefix (lib) that
@ -796,8 +722,7 @@ endif()
configure_package_config_file( configure_package_config_file(
${CMAKE_CURRENT_SOURCE_DIR}/cmake/WebPConfig.cmake.in ${CMAKE_CURRENT_SOURCE_DIR}/cmake/WebPConfig.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/WebPConfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/WebPConfig.cmake
INSTALL_DESTINATION INSTALL_DESTINATION ${ConfigPackageLocation})
${ConfigPackageLocation})
# Install the generated CMake files. # Install the generated CMake files.
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/WebPConfigVersion.cmake" install(FILES "${CMAKE_CURRENT_BINARY_DIR}/WebPConfigVersion.cmake"
@ -829,7 +754,6 @@ foreach(I_MAN RANGE ${MAN_PAGES_RANGE})
if(WEBP_BUILD_${EXEC_BUILD}) if(WEBP_BUILD_${EXEC_BUILD})
list(GET MAN_PAGES ${I_MAN} MAN_PAGE) list(GET MAN_PAGES ${I_MAN} MAN_PAGE)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/man/${MAN_PAGE} install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/man/${MAN_PAGE}
DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT doc)
COMPONENT doc)
endif() endif()
endforeach() endforeach()

26
cmake/cpu.cmake
View File

@ -18,7 +18,8 @@ function(webp_check_compiler_flag WEBP_SIMD_FLAG ENABLE_SIMD)
unset(WEBP_HAVE_FLAG_${WEBP_SIMD_FLAG} CACHE) unset(WEBP_HAVE_FLAG_${WEBP_SIMD_FLAG} CACHE)
cmake_push_check_state() cmake_push_check_state()
set(CMAKE_REQUIRED_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}) set(CMAKE_REQUIRED_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR})
check_c_source_compiles(" check_c_source_compiles(
"
#include \"${CMAKE_CURRENT_LIST_DIR}/../src/dsp/dsp.h\" #include \"${CMAKE_CURRENT_LIST_DIR}/../src/dsp/dsp.h\"
int main(void) { int main(void) {
#if !defined(WEBP_USE_${WEBP_SIMD_FLAG}) #if !defined(WEBP_USE_${WEBP_SIMD_FLAG})
@ -26,7 +27,8 @@ function(webp_check_compiler_flag WEBP_SIMD_FLAG ENABLE_SIMD)
#endif #endif
return 0; return 0;
} }
" WEBP_HAVE_FLAG_${WEBP_SIMD_FLAG}) "
WEBP_HAVE_FLAG_${WEBP_SIMD_FLAG})
cmake_pop_check_state() cmake_pop_check_state()
if(WEBP_HAVE_FLAG_${WEBP_SIMD_FLAG}) if(WEBP_HAVE_FLAG_${WEBP_SIMD_FLAG})
set(WEBP_HAVE_${WEBP_SIMD_FLAG} 1 PARENT_SCOPE) set(WEBP_HAVE_${WEBP_SIMD_FLAG} 1 PARENT_SCOPE)
@ -52,10 +54,8 @@ if(MSVC AND CMAKE_C_COMPILER_ID STREQUAL "MSVC")
endif() endif()
set(SIMD_DISABLE_FLAGS) set(SIMD_DISABLE_FLAGS)
else() else()
set(SIMD_ENABLE_FLAGS set(SIMD_ENABLE_FLAGS "-msse4.1;-msse2;-mips32;-mdspr2;-mfpu=neon;-mmsa")
"-msse4.1;-msse2;-mips32;-mdspr2;-mfpu=neon;-mmsa") set(SIMD_DISABLE_FLAGS "-mno-sse4.1;-mno-sse2;;-mno-dspr2;;-mno-msa")
set(SIMD_DISABLE_FLAGS
"-mno-sse4.1;-mno-sse2;;-mno-dspr2;;-mno-msa")
endif() endif()
set(WEBP_SIMD_FILES_TO_INCLUDE) set(WEBP_SIMD_FILES_TO_INCLUDE)
@ -74,8 +74,8 @@ list(LENGTH WEBP_SIMD_FLAGS WEBP_SIMD_FLAGS_LENGTH)
math(EXPR WEBP_SIMD_FLAGS_RANGE "${WEBP_SIMD_FLAGS_LENGTH} - 1") math(EXPR WEBP_SIMD_FLAGS_RANGE "${WEBP_SIMD_FLAGS_LENGTH} - 1")
foreach(I_SIMD RANGE ${WEBP_SIMD_FLAGS_RANGE}) foreach(I_SIMD RANGE ${WEBP_SIMD_FLAGS_RANGE})
# With Emscripten 2.0.9 -msimd128 -mfpu=neon will enable NEON, but the # With Emscripten 2.0.9 -msimd128 -mfpu=neon will enable NEON, but the source
# source will fail to compile. # will fail to compile.
if(EMSCRIPTEN AND ${I_SIMD} GREATER_EQUAL 2) if(EMSCRIPTEN AND ${I_SIMD} GREATER_EQUAL 2)
break() break()
endif() endif()
@ -107,7 +107,7 @@ foreach(I_SIMD RANGE ${WEBP_SIMD_FLAGS_RANGE})
# Check which files we should include or not. # Check which files we should include or not.
list(GET WEBP_SIMD_FILE_EXTENSIONS ${I_SIMD} WEBP_SIMD_FILE_EXTENSION) list(GET WEBP_SIMD_FILE_EXTENSIONS ${I_SIMD} WEBP_SIMD_FILE_EXTENSION)
file(GLOB SIMD_FILES "${CMAKE_CURRENT_LIST_DIR}/../" file(GLOB SIMD_FILES "${CMAKE_CURRENT_LIST_DIR}/../"
"src/dsp/*${WEBP_SIMD_FILE_EXTENSION}") "src/dsp/*${WEBP_SIMD_FILE_EXTENSION}")
if(WEBP_HAVE_${WEBP_SIMD_FLAG}) if(WEBP_HAVE_${WEBP_SIMD_FLAG})
# Memorize the file and flags. # Memorize the file and flags.
foreach(FILE ${SIMD_FILES}) foreach(FILE ${SIMD_FILES})
@ -141,11 +141,9 @@ foreach(I_SIMD RANGE ${WEBP_SIMD_FLAGS_RANGE})
set(COMMON_PATTERNS) set(COMMON_PATTERNS)
endif() endif()
set(CMAKE_REQUIRED_DEFINITIONS ${SIMD_COMPILE_FLAG}) set(CMAKE_REQUIRED_DEFINITIONS ${SIMD_COMPILE_FLAG})
check_c_source_compiles("int main(void) {return 0;}" check_c_source_compiles(
FLAG_${SIMD_COMPILE_FLAG} "int main(void) {return 0;}" FLAG_${SIMD_COMPILE_FLAG} FAIL_REGEX
FAIL_REGEX "warning: argument unused during compilation:" ${COMMON_PATTERNS})
"warning: argument unused during compilation:"
${COMMON_PATTERNS})
if(NOT FLAG_${SIMD_COMPILE_FLAG}) if(NOT FLAG_${SIMD_COMPILE_FLAG})
unset(HAS_COMPILE_FLAG) unset(HAS_COMPILE_FLAG)
unset(HAS_COMPILE_FLAG CACHE) unset(HAS_COMPILE_FLAG CACHE)

52
cmake/deps.cmake
View File

@ -10,24 +10,30 @@
# Check for compiler options. # Check for compiler options.
include(CheckCSourceCompiles) include(CheckCSourceCompiles)
check_c_source_compiles(" check_c_source_compiles(
"
int main(void) { int main(void) {
(void)__builtin_bswap16(0); (void)__builtin_bswap16(0);
return 0; return 0;
} }
" HAVE_BUILTIN_BSWAP16) "
check_c_source_compiles(" HAVE_BUILTIN_BSWAP16)
check_c_source_compiles(
"
int main(void) { int main(void) {
(void)__builtin_bswap32(0); (void)__builtin_bswap32(0);
return 0; return 0;
} }
" HAVE_BUILTIN_BSWAP32) "
check_c_source_compiles(" HAVE_BUILTIN_BSWAP32)
check_c_source_compiles(
"
int main(void) { int main(void) {
(void)__builtin_bswap64(0); (void)__builtin_bswap64(0);
return 0; return 0;
} }
" HAVE_BUILTIN_BSWAP64) "
HAVE_BUILTIN_BSWAP64)
# Check for libraries. # Check for libraries.
if(WEBP_USE_THREAD) if(WEBP_USE_THREAD)
@ -37,13 +43,15 @@ if(WEBP_USE_THREAD)
if(CMAKE_USE_PTHREADS_INIT AND NOT CMAKE_SYSTEM_NAME STREQUAL "QNX") if(CMAKE_USE_PTHREADS_INIT AND NOT CMAKE_SYSTEM_NAME STREQUAL "QNX")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread")
endif() endif()
check_c_source_compiles(" check_c_source_compiles(
"
#include <pthread.h> #include <pthread.h>
int main (void) { int main (void) {
int attr = PTHREAD_PRIO_INHERIT; int attr = PTHREAD_PRIO_INHERIT;
return attr; return attr;
} }
" FLAG_HAVE_PTHREAD_PRIO_INHERIT) "
FLAG_HAVE_PTHREAD_PRIO_INHERIT)
set(HAVE_PTHREAD_PRIO_INHERIT ${FLAG_HAVE_PTHREAD_PRIO_INHERIT}) set(HAVE_PTHREAD_PRIO_INHERIT ${FLAG_HAVE_PTHREAD_PRIO_INHERIT})
list(APPEND WEBP_DEP_LIBRARIES Threads::Threads) list(APPEND WEBP_DEP_LIBRARIES Threads::Threads)
endif() endif()
@ -59,12 +67,14 @@ set(WEBP_HAVE_GL ${OPENGL_FOUND})
# Check if we need to link to the C math library. We do not look for it as it is # Check if we need to link to the C math library. We do not look for it as it is
# not found when cross-compiling, while it is here. # not found when cross-compiling, while it is here.
check_c_source_compiles(" check_c_source_compiles(
"
#include <math.h> #include <math.h>
int main(int argc, char** argv) { int main(int argc, char** argv) {
return (int)pow(argc, 2.5); return (int)pow(argc, 2.5);
} }
" HAVE_MATH_LIBRARY) "
HAVE_MATH_LIBRARY)
if(NOT HAVE_MATH_LIBRARY) if(NOT HAVE_MATH_LIBRARY)
message(STATUS "Adding -lm flag.") message(STATUS "Adding -lm flag.")
list(APPEND WEBP_DEP_LIBRARIES m) list(APPEND WEBP_DEP_LIBRARIES m)
@ -84,7 +94,7 @@ foreach(I_LIB PNG JPEG TIFF)
if(${I_LIB}_FOUND) if(${I_LIB}_FOUND)
list(APPEND WEBP_DEP_IMG_LIBRARIES ${${I_LIB}_LIBRARIES}) list(APPEND WEBP_DEP_IMG_LIBRARIES ${${I_LIB}_LIBRARIES})
list(APPEND WEBP_DEP_IMG_INCLUDE_DIRS ${${I_LIB}_INCLUDE_DIR} list(APPEND WEBP_DEP_IMG_INCLUDE_DIRS ${${I_LIB}_INCLUDE_DIR}
${${I_LIB}_INCLUDE_DIRS}) ${${I_LIB}_INCLUDE_DIRS})
endif() endif()
endforeach() endforeach()
if(WEBP_DEP_IMG_INCLUDE_DIRS) if(WEBP_DEP_IMG_INCLUDE_DIRS)
@ -105,13 +115,15 @@ if(GIF_FOUND)
cmake_push_check_state() cmake_push_check_state()
set(CMAKE_REQUIRED_LIBRARIES ${GIF_LIBRARIES}) set(CMAKE_REQUIRED_LIBRARIES ${GIF_LIBRARIES})
set(CMAKE_REQUIRED_INCLUDES ${GIF_INCLUDE_DIR}) set(CMAKE_REQUIRED_INCLUDES ${GIF_INCLUDE_DIR})
check_c_source_compiles(" check_c_source_compiles(
"
#include <gif_lib.h> #include <gif_lib.h>
int main(void) { int main(void) {
(void)DGifOpenFileHandle; (void)DGifOpenFileHandle;
return 0; return 0;
} }
" GIF_COMPILES) "
GIF_COMPILES)
cmake_pop_check_state() cmake_pop_check_state()
if(GIF_COMPILES) if(GIF_COMPILES)
list(APPEND WEBP_DEP_GIF_LIBRARIES ${GIF_LIBRARIES}) list(APPEND WEBP_DEP_GIF_LIBRARIES ${GIF_LIBRARIES})
@ -143,10 +155,7 @@ check_include_files(windows.h HAVE_WINDOWS_H)
# Windows specifics # Windows specifics
if(HAVE_WINCODEC_H) if(HAVE_WINCODEC_H)
list(APPEND WEBP_DEP_LIBRARIES list(APPEND WEBP_DEP_LIBRARIES shlwapi ole32 windowscodecs)
shlwapi
ole32
windowscodecs)
endif() endif()
# Check for SIMD extensions. # Check for SIMD extensions.
@ -158,17 +167,12 @@ set(PACKAGE_NAME ${PROJECT_NAME})
# Read from configure.ac. # Read from configure.ac.
file(READ ${CMAKE_CURRENT_SOURCE_DIR}/configure.ac CONFIGURE_AC) file(READ ${CMAKE_CURRENT_SOURCE_DIR}/configure.ac CONFIGURE_AC)
string(REGEX MATCHALL string(REGEX MATCHALL "\\[([0-9a-z\\.:/]*)\\]" CONFIGURE_AC_PACKAGE_INFO
"\\[([0-9a-z\\.:/]*)\\]"
CONFIGURE_AC_PACKAGE_INFO
${CONFIGURE_AC}) ${CONFIGURE_AC})
function(strip_bracket VAR) function(strip_bracket VAR)
string(LENGTH ${${VAR}} TMP_LEN) string(LENGTH ${${VAR}} TMP_LEN)
math(EXPR TMP_LEN ${TMP_LEN}-2) math(EXPR TMP_LEN ${TMP_LEN}-2)
string(SUBSTRING ${${VAR}} string(SUBSTRING ${${VAR}} 1 ${TMP_LEN} TMP_SUB)
1
${TMP_LEN}
TMP_SUB)
set(${VAR} ${TMP_SUB} PARENT_SCOPE) set(${VAR} ${TMP_SUB} PARENT_SCOPE)
endfunction() endfunction()