Revert "cmake: fix webpmux lib name for cmake linking"
This reverts commit 13b8281609113c4904877e637d4e8a775d8150bc.
This breaks target name compatibility with earlier releases.
Conflicts:
CMakeLists.txt
Bug: webp:575
Change-Id: I3d4895b8a8d14b3f4595ec19646ec4a1001c7748
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d1b120b..5171bbe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -509,18 +509,19 @@
if(WEBP_BUILD_LIBWEBPMUX)
parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/src/mux "WEBP_MUX_SRCS" "")
- add_library(webpmux ${WEBP_MUX_SRCS})
- target_link_libraries(webpmux webp)
- target_include_directories(webpmux
+ add_library(libwebpmux ${WEBP_MUX_SRCS})
+ target_link_libraries(libwebpmux webp)
+ target_include_directories(libwebpmux
PRIVATE ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR})
- set_version(mux/Makefile.am webpmux webpmux)
- set_target_properties(webpmux
+ set_version(mux/Makefile.am libwebpmux webpmux)
+ set_target_properties(libwebpmux
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/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")
endif()
@@ -534,7 +535,7 @@
exampleutil
imageioutil
webp
- webpmux
+ libwebpmux
${WEBP_DEP_GIF_LIBRARIES})
target_include_directories(gif2webp PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
install(TARGETS gif2webp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
@@ -551,7 +552,7 @@
imagedec
imageioutil
webp
- webpmux)
+ libwebpmux)
target_include_directories(img2webp PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
install(TARGETS img2webp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
@@ -601,12 +602,10 @@
# webpmux
parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/examples "WEBPMUX_SRCS"
"webpmux")
- add_executable(webpmux_app ${WEBPMUX_SRCS})
- set_target_properties(webpmux_app PROPERTIES OUTPUT_NAME webpmux)
- target_link_libraries(webpmux_app exampleutil imageioutil webpmux webp)
- target_include_directories(webpmux_app
- PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
- install(TARGETS webpmux_app RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ add_executable(webpmux ${WEBPMUX_SRCS})
+ target_link_libraries(webpmux exampleutil imageioutil libwebpmux webp)
+ target_include_directories(webpmux PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src)
+ install(TARGETS webpmux RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
if(WEBP_BUILD_EXTRAS)