always build mux library

This commit is contained in:
Alexander Neumann 2020-01-16 19:39:47 +01:00
parent 68d7204560
commit af2bf73d30
4 changed files with 16 additions and 2 deletions

View File

@ -1,5 +1,5 @@
Source: freeimage
Version: 3.18.0-9
Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openjpeg, libwebp[img2webp] (!uwp), libraw, jxrlib, openexr
Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openjpeg, libwebp (!uwp), libraw, jxrlib, openexr
Homepage: https://sourceforge.net/projects/freeimage/
Description: Support library for graphics image formats

View File

@ -17,7 +17,7 @@ index 9503daacb..2fb9ef137 100644
${CMAKE_CURRENT_SOURCE_DIR}/src/webp/mux_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)
+ set_target_properties(libwebpmux PROPERTIES OUTPUT_NAME $<$<PLATFORM_ID:Windows>:lib>webpmux)
list(APPEND INSTALLED_LIBRARIES libwebpmux)
configure_pkg_config("src/mux/libwebpmux.pc")
endif()

View File

@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f6c8eca2..00366ae53 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -405,7 +405,7 @@ if(WEBP_BUILD_CWEBP)
install(TARGETS cwebp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
-if(WEBP_BUILD_GIF2WEBP OR WEBP_BUILD_IMG2WEBP)
+if(WEBP_BUILD_GIF2WEBP OR WEBP_BUILD_IMG2WEBP OR TRUE)
parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/src/mux "WEBP_MUX_SRCS" "")
add_library(libwebpmux ${WEBP_MUX_SRCS})
target_link_libraries(libwebpmux webp)

View File

@ -7,6 +7,7 @@ vcpkg_from_github(
PATCHES
0001-build.patch
0002-cmake-config-add-backwards-compatibility.patch
0003-always-mux.patch #always build libwebpmux
0004-add-missing-linked-library.patch
0006-fix-dependecies-platform.patch
0007-fix-arm-build.patch