[DO-971] ffmpeg recipe with requirements (!9)
Co-authored-by: aleksandr.vodyanov <aleksandr.vodyanov@avroid.tech> Reviewed-on: https://git.avroid.tech/Conan/conan_build/pulls/9
This commit is contained in:
21
recipes/libwebp/all/patches/1.3.1-0001-fix-cmake.patch
Normal file
21
recipes/libwebp/all/patches/1.3.1-0001-fix-cmake.patch
Normal file
@@ -0,0 +1,21 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index ad5e14c3..89c836f3 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -58,7 +58,6 @@ if(WEBP_LINK_STATIC)
|
||||
else()
|
||||
set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
|
||||
endif()
|
||||
- set(CMAKE_POSITION_INDEPENDENT_CODE ON)
|
||||
# vwebp does not compile on Ubuntu with static libraries so disabling it for
|
||||
# now.
|
||||
set(WEBP_BUILD_VWEBP OFF)
|
||||
@@ -153,7 +152,7 @@ endif()
|
||||
set(PTHREAD_LIBS ${CMAKE_THREAD_LIBS_INIT})
|
||||
set(INSTALLED_LIBRARIES)
|
||||
|
||||
-if(MSVC)
|
||||
+if(0)
|
||||
# match the naming convention used by nmake
|
||||
set(webp_libname_prefix "lib")
|
||||
set(CMAKE_SHARED_LIBRARY_PREFIX "${webp_libname_prefix}")
|
||||
Reference in New Issue
Block a user