use pkg-config to find libwebp and libwebpdemux during builds

striezel · Mar 22, 2024 · ab67bfe · ab67bfe
1 parent 4249f36
commit ab67bfe
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 74 deletions.
diff --git a/cmake/webp-config.cmake b/cmake/webp-config.cmake
diff --git a/cmake/webpdemux-config.cmake b/cmake/webpdemux-config.cmake
diff --git a/webp-viewer/CMakeLists.txt b/webp-viewer/CMakeLists.txt
@@ -65,8 +65,8 @@ else ()
 endif ()
 
 # libwebp
-set(webp_DIR "../cmake/" )
-find_package (webp REQUIRED)
+find_package(PkgConfig)
+pkg_search_module (WEBP REQUIRED libwebp)
 if (WEBP_FOUND)
   include_directories(${WEBP_INCLUDE_DIRS})
   target_link_libraries (webp-viewer ${WEBP_LIBRARIES})
@@ -75,8 +75,7 @@ else ()
 endif ()
 
 # libwebpdemux
-set(webpdemux_DIR "../cmake/" )
-find_package (webpdemux REQUIRED)
+pkg_search_module (WEBPDEMUX REQUIRED libwebpdemux)
 if (WEBPDEMUX_FOUND)
   include_directories(${WEBPDEMUX_INCLUDE_DIRS})
   target_link_libraries (webp-viewer ${WEBPDEMUX_LIBRARIES})