mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-16 00:21:36 +08:00
2017886818
- Setup and use pkg-config for ffmpeg dependencies. https://github.com/microsoft/vcpkg/pull/38011#discussion_r1623174355. - Export actual c++ link libraries for fdk-aac via pkg-config. (Same pattern as lerc, geos.) - Rectify link libraries in pkg-config for alsa, libsrt, snappy, x265. - Burn-in dllimport for libsrt and x265. - Pass detected STRIP to ffmpeg. Fixes https://github.com/microsoft/vcpkg/issues/36852.
17 lines
576 B
Diff
17 lines
576 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 1492306..69287ec 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -1182,7 +1182,11 @@ endif()
|
|
# if your build requires it, you'd probably remove -lstdc++ from the list
|
|
# obtained by `pkg-config --libs`.
|
|
if(ENABLE_CXX_DEPS)
|
|
+ cmake_policy(SET CMP0057 NEW)
|
|
foreach(LIB ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES})
|
|
+ if(LIB IN_LIST CMAKE_C_IMPLICIT_LINK_LIBRARIES)
|
|
+ continue()
|
|
+ endif()
|
|
if((IS_ABSOLUTE ${LIB} AND EXISTS ${LIB}) OR (${LIB} MATCHES "^-l"))
|
|
set(SRT_LIBS_PRIVATE ${SRT_LIBS_PRIVATE} ${LIB})
|
|
else()
|