From dfd60fa63b9e4ee6e473fed455553678acefddd6 Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Thu, 24 Sep 2020 19:43:33 +0100 Subject: [libvpx] fix cmake target for linux (#13636) --- ports/libvpx/CONTROL | 2 +- ports/libvpx/portfile.cmake | 1 + ports/libvpx/unofficial-libvpx-config.cmake.in | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ports/libvpx/CONTROL b/ports/libvpx/CONTROL index a61d534b5..8cdbaa470 100644 --- a/ports/libvpx/CONTROL +++ b/ports/libvpx/CONTROL @@ -1,6 +1,6 @@ Source: libvpx Version: 1.9.0 -Port-Version: 1 +Port-Version: 2 Homepage: https://github.com/webmproject/libvpx Description: The reference software implementation for the video coding formats VP8 and VP9. Supports: !(uwp&arm) diff --git a/ports/libvpx/portfile.cmake b/ports/libvpx/portfile.cmake index 1e4ad6d3c..a3adee4a9 100644 --- a/ports/libvpx/portfile.cmake +++ b/ports/libvpx/portfile.cmake @@ -213,6 +213,7 @@ else() ) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/libvpx_g.a) endif() endif() diff --git a/ports/libvpx/unofficial-libvpx-config.cmake.in b/ports/libvpx/unofficial-libvpx-config.cmake.in index 6e8fced36..e475927b6 100644 --- a/ports/libvpx/unofficial-libvpx-config.cmake.in +++ b/ports/libvpx/unofficial-libvpx-config.cmake.in @@ -15,7 +15,7 @@ if(NOT TARGET unofficial::libvpx::libvpx) list(APPEND _IMPORT_CHECK_FILES "${_IMPORT_PREFIX}/include/vpx/vpx_codec.h") # Add release configuration properties. - find_library(_LIBFILE_RELEASE NAMES vpx@LIBVPX_CRT_SUFFIX@ PATHS "${_IMPORT_PREFIX}/lib/" NO_DEFAULT_PATH) + find_library(_LIBFILE_RELEASE NAMES vpx vpx@LIBVPX_CRT_SUFFIX@ PATHS "${_IMPORT_PREFIX}/lib/" NO_DEFAULT_PATH) set_property(TARGET unofficial::libvpx::libvpx APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) set_target_properties(unofficial::libvpx::libvpx PROPERTIES @@ -25,7 +25,7 @@ if(NOT TARGET unofficial::libvpx::libvpx) # Add debug configuration properties. if(@LIBVPX_CONFIG_DEBUG@) - find_library(_LIBFILE_DEBUG NAMES vpx@LIBVPX_CRT_SUFFIX@d PATHS "${_IMPORT_PREFIX}/debug/lib/" NO_DEFAULT_PATH) + find_library(_LIBFILE_DEBUG NAMES vpx vpx@LIBVPX_CRT_SUFFIX@d PATHS "${_IMPORT_PREFIX}/debug/lib/" NO_DEFAULT_PATH) set_property(TARGET unofficial::libvpx::libvpx APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) set_target_properties(unofficial::libvpx::libvpx PROPERTIES -- cgit v1.2.3