dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-10-31 02:15:42 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "cmake: fix webpmux lib name for cmake linking"

Browse Source 
This reverts commit 13b8281609.

This breaks target name compatibility with earlier releases.

Conflicts:
	CMakeLists.txt

Bug: webp:575
Change-Id: I3d4895b8a8d14b3f4595ec19646ec4a1001c7748
This commit is contained in:
James Zern
2022-07-21 17:57:23 -07:00
parent 3c4a0fbfbc
commit c2e3fd30c4
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
CMakeLists.txt
View File

@@ -509,18 +509,19 @@ endif()
if(WEBP_BUILD_LIBWEBPMUX) 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(webpmux ${WEBP_MUX_SRCS}) add_library(libwebpmux ${WEBP_MUX_SRCS})
target_link_libraries(webpmux webp) target_link_libraries(libwebpmux webp)
target_include_directories(webpmux target_include_directories(libwebpmux
PRIVATE ${CMAKE_CURRENT_BINARY_DIR} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}) ${CMAKE_CURRENT_SOURCE_DIR})
set_version(mux/Makefile.am webpmux webpmux) set_version(mux/Makefile.am libwebpmux webpmux)
set_target_properties(webpmux set_target_properties(libwebpmux
PROPERTIES PUBLIC_HEADER PROPERTIES PUBLIC_HEADER
"${CMAKE_CURRENT_SOURCE_DIR}/src/webp/mux.h;\ "${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;")
list(APPEND INSTALLED_LIBRARIES webpmux) set_target_properties(libwebpmux PROPERTIES OUTPUT_NAME webpmux)
list(APPEND INSTALLED_LIBRARIES libwebpmux)
configure_pkg_config("src/mux/libwebpmux.pc") configure_pkg_config("src/mux/libwebpmux.pc")
endif() endif()
@@ -534,7 +535,7 @@ if(WEBP_BUILD_GIF2WEBP)
exampleutil exampleutil
imageioutil imageioutil
webp webp
webpmux 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})
@@ -551,7 +552,7 @@ if(WEBP_BUILD_IMG2WEBP)
imagedec imagedec
imageioutil imageioutil
webp webp
webpmux) 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})
endif() endif()
@@ -601,12 +602,10 @@ if(WEBP_BUILD_WEBPMUX)
# webpmux # webpmux
parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/examples "WEBPMUX_SRCS" parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/examples "WEBPMUX_SRCS"
"webpmux") "webpmux")
add_executable(webpmux_app ${WEBPMUX_SRCS}) add_executable(webpmux ${WEBPMUX_SRCS})
set_target_properties(webpmux_app PROPERTIES OUTPUT_NAME webpmux) target_link_libraries(webpmux exampleutil imageioutil libwebpmux webp)
target_link_libraries(webpmux_app exampleutil imageioutil webpmux webp) target_include_directories(webpmux PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
target_include_directories(webpmux_app install(TARGETS webpmux RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
install(TARGETS webpmux_app RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif() endif()
if(WEBP_BUILD_EXTRAS) if(WEBP_BUILD_EXTRAS)