[ffmpeg] Add support for dav1d,fontconfig,freetype,fribidi,ilbc,modplug,opengl,openjpeg,libssh,tensorflow,tesseract,webp,libxml2 dependencies. (#15787)
* [tesseract] Use vcpkg_fixup_pkgconfig.
* [libxml2] Correct pkgconfig lib name.
* [libwebp] Use vcpkg_fixup_pkgconfig.
* [libssh] Export pkgconfig on windows.
Also move to using git to get source.
* [modplug] Export pkgconfig on windows.
* [ffmpeg] Add support for fontconfig,freetype,fribidi,modplug,openjpeg,libssh,tesseract,libxml2 dependencies.
* [openjpeg] Correct required static link libs in pkgconfig.
* [modplug] Combine vcpkg_from_github using variable.
* Update ports/libssh/CONTROL
* Improve portfile.cmake
* update version records.
* [openjpeg] Update libs in pkgcfg.
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* update version records
* [libssh] Add pthread to pkgconfig when using mbedtls.
* [libssh] Correct pthread naming on windows.
* [fontconfig] Add libintl to pkgconfig on windows.
* update version records
* [ffmpeg] Fixup FindFFmpeg.
* [ffmpeg] speex now supports non-windows.
* [ffmpeg] Add feature libass.
* [ffmpeg] Add dav1d feature.
* [ffmpeg] Add feature ilbc.
* [ffmpeg] Add tensorflow feature.
* [ffmpeg] update version record.
* [ffmpeg] Add CI feature test.
* [ffmpeg] Limit features based on CI failures.
* [ffmpeg] Update version record.
* [ffmpeg] limit features based on ci.baseline.
* [various ports] Update supports field.
* [ffmpeg] Limit features more based on CI.
* update version records.
* [ffmpeg] Add detection of additional non target deps..
select_library_configurations_from_names currently detects the debug libs even for release builds as _IMPORT_PREFIX was not being set.
* [aubio] Silence warning about FindFFMPEG.
* [pangolin] Use vcpkg supplied FindFFMPEG.
* update version files.
* [ffnvcodec] Set as not supporting uwp.
ffnvcodec will build under uwp as its a header only lib, but it can not be used as it requires dynamic dll loading.
* [ffmpeg] Update feature all.
* update version records
* [tesseract] Wrap debug pkgcfg update.
* [libssh,libxml2,openjpeg,fontconfig] Fix pkg-config for release only triplets.
* [libssh] Correct port version after merge.
* [ffmpeg] Fixup after merge.
* Update version files.
* [ffmpeg] Add opengl support.
* [ffmpeg] Update package version.
* [ffmpeg] Fix ffnvcodec support.
* [ffmpeg] Fix x265 detection on osx.
* [libvpx] Enable arm-uwp build.
* [ffmpeg] Fixup x265 patch.
* trigger sdl rebuild
* [ffmpeg] Disable opengl on osx.
* Revert "trigger sdl rebuild"
This reverts commit 94065bfe8414259ad5a5576bd4ac0b7ab4b97c6b.
* [ffmpeg] Disable failing features on osx.
* Update ports/ffmpeg/FindFFMPEG.cmake.in
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
* [ffmpeg] Add ass dependencies to FindFFmpeg.
* Update ports/ffmpeg/FindFFMPEG.cmake.in
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
* update version
* [fontconfig] disable pthread/json as they are not needed for lib builds.
Only used for tests.
* [ffmpeg] Enable fontconfig on static+windows.
* update versions
* update versions.
* Fix incorrectly included commits
* revert pangolin commit
Reverts most of 2543be2edf60bf38511c2d477bb17b617398a108
* update versions
* Correct port version after merge.
* update versions.
* [ffmpeg] Fix cmake dependency detection on non-windows.
* Revert "revert pangolin commit"
This reverts commit f59bc5a53ea74fd9df17fc368886e9d1a80ac42f.
* [ffmpeg] Fix dependency loading that does not define separate debug/release libs.
* update versions.
* [ffmpeg] set CMP0072 policy.
* [wavpack] Fix cmake config export.
* [ffmpeg] Add optional system dependent libraries.
* update versions after merge.
* update versions.
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
2021-04-08 01:06:55 +08:00
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
2024-07-08 22:25:27 +08:00
|
|
|
index a64b770..716bb34 100644
|
[ffmpeg] Add support for dav1d,fontconfig,freetype,fribidi,ilbc,modplug,opengl,openjpeg,libssh,tensorflow,tesseract,webp,libxml2 dependencies. (#15787)
* [tesseract] Use vcpkg_fixup_pkgconfig.
* [libxml2] Correct pkgconfig lib name.
* [libwebp] Use vcpkg_fixup_pkgconfig.
* [libssh] Export pkgconfig on windows.
Also move to using git to get source.
* [modplug] Export pkgconfig on windows.
* [ffmpeg] Add support for fontconfig,freetype,fribidi,modplug,openjpeg,libssh,tesseract,libxml2 dependencies.
* [openjpeg] Correct required static link libs in pkgconfig.
* [modplug] Combine vcpkg_from_github using variable.
* Update ports/libssh/CONTROL
* Improve portfile.cmake
* update version records.
* [openjpeg] Update libs in pkgcfg.
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* update version records
* [libssh] Add pthread to pkgconfig when using mbedtls.
* [libssh] Correct pthread naming on windows.
* [fontconfig] Add libintl to pkgconfig on windows.
* update version records
* [ffmpeg] Fixup FindFFmpeg.
* [ffmpeg] speex now supports non-windows.
* [ffmpeg] Add feature libass.
* [ffmpeg] Add dav1d feature.
* [ffmpeg] Add feature ilbc.
* [ffmpeg] Add tensorflow feature.
* [ffmpeg] update version record.
* [ffmpeg] Add CI feature test.
* [ffmpeg] Limit features based on CI failures.
* [ffmpeg] Update version record.
* [ffmpeg] limit features based on ci.baseline.
* [various ports] Update supports field.
* [ffmpeg] Limit features more based on CI.
* update version records.
* [ffmpeg] Add detection of additional non target deps..
select_library_configurations_from_names currently detects the debug libs even for release builds as _IMPORT_PREFIX was not being set.
* [aubio] Silence warning about FindFFMPEG.
* [pangolin] Use vcpkg supplied FindFFMPEG.
* update version files.
* [ffnvcodec] Set as not supporting uwp.
ffnvcodec will build under uwp as its a header only lib, but it can not be used as it requires dynamic dll loading.
* [ffmpeg] Update feature all.
* update version records
* [tesseract] Wrap debug pkgcfg update.
* [libssh,libxml2,openjpeg,fontconfig] Fix pkg-config for release only triplets.
* [libssh] Correct port version after merge.
* [ffmpeg] Fixup after merge.
* Update version files.
* [ffmpeg] Add opengl support.
* [ffmpeg] Update package version.
* [ffmpeg] Fix ffnvcodec support.
* [ffmpeg] Fix x265 detection on osx.
* [libvpx] Enable arm-uwp build.
* [ffmpeg] Fixup x265 patch.
* trigger sdl rebuild
* [ffmpeg] Disable opengl on osx.
* Revert "trigger sdl rebuild"
This reverts commit 94065bfe8414259ad5a5576bd4ac0b7ab4b97c6b.
* [ffmpeg] Disable failing features on osx.
* Update ports/ffmpeg/FindFFMPEG.cmake.in
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
* [ffmpeg] Add ass dependencies to FindFFmpeg.
* Update ports/ffmpeg/FindFFMPEG.cmake.in
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
* update version
* [fontconfig] disable pthread/json as they are not needed for lib builds.
Only used for tests.
* [ffmpeg] Enable fontconfig on static+windows.
* update versions
* update versions.
* Fix incorrectly included commits
* revert pangolin commit
Reverts most of 2543be2edf60bf38511c2d477bb17b617398a108
* update versions
* Correct port version after merge.
* update versions.
* [ffmpeg] Fix cmake dependency detection on non-windows.
* Revert "revert pangolin commit"
This reverts commit f59bc5a53ea74fd9df17fc368886e9d1a80ac42f.
* [ffmpeg] Fix dependency loading that does not define separate debug/release libs.
* update versions.
* [ffmpeg] set CMP0072 policy.
* [wavpack] Fix cmake config export.
* [ffmpeg] Add optional system dependent libraries.
* update versions after merge.
* update versions.
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
2021-04-08 01:06:55 +08:00
|
|
|
--- a/CMakeLists.txt
|
|
|
|
|
+++ b/CMakeLists.txt
|
2024-07-08 22:25:27 +08:00
|
|
|
@@ -43,8 +43,12 @@ macro_ensure_out_of_source_build("${PROJECT_NAME} requires an out of source buil
|
|
|
|
|
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
|
|
|
|
|
|
|
|
|
|
# search for libraries
|
|
|
|
|
+set(PC_LIBS_PRIVATE "")
|
|
|
|
|
+set(PC_REQUIRES_PRIVATE "")
|
|
|
|
|
+
|
|
|
|
|
if (WITH_ZLIB)
|
|
|
|
|
find_package(ZLIB REQUIRED)
|
|
|
|
|
+ string(APPEND PC_REQUIRES_PRIVATE "zlib")
|
|
|
|
|
endif (WITH_ZLIB)
|
|
|
|
|
|
|
|
|
|
if (WITH_GCRYPT)
|
|
|
|
|
@@ -60,6 +64,7 @@ elseif(WITH_MBEDTLS)
|
|
|
|
|
else (WITH_GCRYPT)
|
|
|
|
|
find_package(OpenSSL 1.0.1)
|
|
|
|
|
if (OPENSSL_FOUND)
|
|
|
|
|
+ string(APPEND PC_REQUIRES_PRIVATE " libcrypto")
|
|
|
|
|
# On CMake < 3.16, OPENSSL_CRYPTO_LIBRARIES is usually a synonym for OPENSSL_CRYPTO_LIBRARY, but is not defined
|
|
|
|
|
# when building on Windows outside of Cygwin. We provide the synonym here, if FindOpenSSL didn't define it already.
|
|
|
|
|
if (NOT DEFINED OPENSSL_CRYPTO_LIBRARIES)
|
|
|
|
|
@@ -84,6 +89,9 @@ endif ()
|
|
|
|
|
set(CMAKE_THREAD_PREFER_PTHREADS ON)
|
|
|
|
|
set(THREADS_PREFER_PTHREAD_FLAG ON)
|
|
|
|
|
find_package(Threads)
|
|
|
|
|
+if(Threads_FOUND)
|
|
|
|
|
+ string(APPEND PC_LIBS_PRIVATE " ${CMAKE_THREAD_LIBS_INIT}")
|
|
|
|
|
+endif()
|
|
|
|
|
|
|
|
|
|
if (WITH_GSSAPI)
|
|
|
|
|
find_package(GSSAPI)
|
|
|
|
|
@@ -122,7 +130,6 @@ add_subdirectory(include)
|
[ffmpeg] Add support for dav1d,fontconfig,freetype,fribidi,ilbc,modplug,opengl,openjpeg,libssh,tensorflow,tesseract,webp,libxml2 dependencies. (#15787)
* [tesseract] Use vcpkg_fixup_pkgconfig.
* [libxml2] Correct pkgconfig lib name.
* [libwebp] Use vcpkg_fixup_pkgconfig.
* [libssh] Export pkgconfig on windows.
Also move to using git to get source.
* [modplug] Export pkgconfig on windows.
* [ffmpeg] Add support for fontconfig,freetype,fribidi,modplug,openjpeg,libssh,tesseract,libxml2 dependencies.
* [openjpeg] Correct required static link libs in pkgconfig.
* [modplug] Combine vcpkg_from_github using variable.
* Update ports/libssh/CONTROL
* Improve portfile.cmake
* update version records.
* [openjpeg] Update libs in pkgcfg.
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* update version records
* [libssh] Add pthread to pkgconfig when using mbedtls.
* [libssh] Correct pthread naming on windows.
* [fontconfig] Add libintl to pkgconfig on windows.
* update version records
* [ffmpeg] Fixup FindFFmpeg.
* [ffmpeg] speex now supports non-windows.
* [ffmpeg] Add feature libass.
* [ffmpeg] Add dav1d feature.
* [ffmpeg] Add feature ilbc.
* [ffmpeg] Add tensorflow feature.
* [ffmpeg] update version record.
* [ffmpeg] Add CI feature test.
* [ffmpeg] Limit features based on CI failures.
* [ffmpeg] Update version record.
* [ffmpeg] limit features based on ci.baseline.
* [various ports] Update supports field.
* [ffmpeg] Limit features more based on CI.
* update version records.
* [ffmpeg] Add detection of additional non target deps..
select_library_configurations_from_names currently detects the debug libs even for release builds as _IMPORT_PREFIX was not being set.
* [aubio] Silence warning about FindFFMPEG.
* [pangolin] Use vcpkg supplied FindFFMPEG.
* update version files.
* [ffnvcodec] Set as not supporting uwp.
ffnvcodec will build under uwp as its a header only lib, but it can not be used as it requires dynamic dll loading.
* [ffmpeg] Update feature all.
* update version records
* [tesseract] Wrap debug pkgcfg update.
* [libssh,libxml2,openjpeg,fontconfig] Fix pkg-config for release only triplets.
* [libssh] Correct port version after merge.
* [ffmpeg] Fixup after merge.
* Update version files.
* [ffmpeg] Add opengl support.
* [ffmpeg] Update package version.
* [ffmpeg] Fix ffnvcodec support.
* [ffmpeg] Fix x265 detection on osx.
* [libvpx] Enable arm-uwp build.
* [ffmpeg] Fixup x265 patch.
* trigger sdl rebuild
* [ffmpeg] Disable opengl on osx.
* Revert "trigger sdl rebuild"
This reverts commit 94065bfe8414259ad5a5576bd4ac0b7ab4b97c6b.
* [ffmpeg] Disable failing features on osx.
* Update ports/ffmpeg/FindFFMPEG.cmake.in
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
* [ffmpeg] Add ass dependencies to FindFFmpeg.
* Update ports/ffmpeg/FindFFMPEG.cmake.in
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
* update version
* [fontconfig] disable pthread/json as they are not needed for lib builds.
Only used for tests.
* [ffmpeg] Enable fontconfig on static+windows.
* update versions
* update versions.
* Fix incorrectly included commits
* revert pangolin commit
Reverts most of 2543be2edf60bf38511c2d477bb17b617398a108
* update versions
* Correct port version after merge.
* update versions.
* [ffmpeg] Fix cmake dependency detection on non-windows.
* Revert "revert pangolin commit"
This reverts commit f59bc5a53ea74fd9df17fc368886e9d1a80ac42f.
* [ffmpeg] Fix dependency loading that does not define separate debug/release libs.
* update versions.
* [ffmpeg] set CMP0072 policy.
* [wavpack] Fix cmake config export.
* [ffmpeg] Add optional system dependent libraries.
* update versions after merge.
* update versions.
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
2021-04-08 01:06:55 +08:00
|
|
|
add_subdirectory(src)
|
|
|
|
|
|
|
|
|
|
# pkg-config file
|
2022-10-26 11:45:19 +08:00
|
|
|
-if (UNIX OR MINGW)
|
2022-11-29 03:06:31 +08:00
|
|
|
configure_file(libssh.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libssh.pc @ONLY)
|
[ffmpeg] Add support for dav1d,fontconfig,freetype,fribidi,ilbc,modplug,opengl,openjpeg,libssh,tensorflow,tesseract,webp,libxml2 dependencies. (#15787)
* [tesseract] Use vcpkg_fixup_pkgconfig.
* [libxml2] Correct pkgconfig lib name.
* [libwebp] Use vcpkg_fixup_pkgconfig.
* [libssh] Export pkgconfig on windows.
Also move to using git to get source.
* [modplug] Export pkgconfig on windows.
* [ffmpeg] Add support for fontconfig,freetype,fribidi,modplug,openjpeg,libssh,tesseract,libxml2 dependencies.
* [openjpeg] Correct required static link libs in pkgconfig.
* [modplug] Combine vcpkg_from_github using variable.
* Update ports/libssh/CONTROL
* Improve portfile.cmake
* update version records.
* [openjpeg] Update libs in pkgcfg.
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* update version records
* [libssh] Add pthread to pkgconfig when using mbedtls.
* [libssh] Correct pthread naming on windows.
* [fontconfig] Add libintl to pkgconfig on windows.
* update version records
* [ffmpeg] Fixup FindFFmpeg.
* [ffmpeg] speex now supports non-windows.
* [ffmpeg] Add feature libass.
* [ffmpeg] Add dav1d feature.
* [ffmpeg] Add feature ilbc.
* [ffmpeg] Add tensorflow feature.
* [ffmpeg] update version record.
* [ffmpeg] Add CI feature test.
* [ffmpeg] Limit features based on CI failures.
* [ffmpeg] Update version record.
* [ffmpeg] limit features based on ci.baseline.
* [various ports] Update supports field.
* [ffmpeg] Limit features more based on CI.
* update version records.
* [ffmpeg] Add detection of additional non target deps..
select_library_configurations_from_names currently detects the debug libs even for release builds as _IMPORT_PREFIX was not being set.
* [aubio] Silence warning about FindFFMPEG.
* [pangolin] Use vcpkg supplied FindFFMPEG.
* update version files.
* [ffnvcodec] Set as not supporting uwp.
ffnvcodec will build under uwp as its a header only lib, but it can not be used as it requires dynamic dll loading.
* [ffmpeg] Update feature all.
* update version records
* [tesseract] Wrap debug pkgcfg update.
* [libssh,libxml2,openjpeg,fontconfig] Fix pkg-config for release only triplets.
* [libssh] Correct port version after merge.
* [ffmpeg] Fixup after merge.
* Update version files.
* [ffmpeg] Add opengl support.
* [ffmpeg] Update package version.
* [ffmpeg] Fix ffnvcodec support.
* [ffmpeg] Fix x265 detection on osx.
* [libvpx] Enable arm-uwp build.
* [ffmpeg] Fixup x265 patch.
* trigger sdl rebuild
* [ffmpeg] Disable opengl on osx.
* Revert "trigger sdl rebuild"
This reverts commit 94065bfe8414259ad5a5576bd4ac0b7ab4b97c6b.
* [ffmpeg] Disable failing features on osx.
* Update ports/ffmpeg/FindFFMPEG.cmake.in
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
* [ffmpeg] Add ass dependencies to FindFFmpeg.
* Update ports/ffmpeg/FindFFMPEG.cmake.in
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
* update version
* [fontconfig] disable pthread/json as they are not needed for lib builds.
Only used for tests.
* [ffmpeg] Enable fontconfig on static+windows.
* update versions
* update versions.
* Fix incorrectly included commits
* revert pangolin commit
Reverts most of 2543be2edf60bf38511c2d477bb17b617398a108
* update versions
* Correct port version after merge.
* update versions.
* [ffmpeg] Fix cmake dependency detection on non-windows.
* Revert "revert pangolin commit"
This reverts commit f59bc5a53ea74fd9df17fc368886e9d1a80ac42f.
* [ffmpeg] Fix dependency loading that does not define separate debug/release libs.
* update versions.
* [ffmpeg] set CMP0072 policy.
* [wavpack] Fix cmake config export.
* [ffmpeg] Add optional system dependent libraries.
* update versions after merge.
* update versions.
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
2021-04-08 01:06:55 +08:00
|
|
|
install(
|
|
|
|
|
FILES
|
2024-07-08 22:25:27 +08:00
|
|
|
@@ -132,7 +139,6 @@ install(
|
[ffmpeg] Add support for dav1d,fontconfig,freetype,fribidi,ilbc,modplug,opengl,openjpeg,libssh,tensorflow,tesseract,webp,libxml2 dependencies. (#15787)
* [tesseract] Use vcpkg_fixup_pkgconfig.
* [libxml2] Correct pkgconfig lib name.
* [libwebp] Use vcpkg_fixup_pkgconfig.
* [libssh] Export pkgconfig on windows.
Also move to using git to get source.
* [modplug] Export pkgconfig on windows.
* [ffmpeg] Add support for fontconfig,freetype,fribidi,modplug,openjpeg,libssh,tesseract,libxml2 dependencies.
* [openjpeg] Correct required static link libs in pkgconfig.
* [modplug] Combine vcpkg_from_github using variable.
* Update ports/libssh/CONTROL
* Improve portfile.cmake
* update version records.
* [openjpeg] Update libs in pkgcfg.
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* update version records
* [libssh] Add pthread to pkgconfig when using mbedtls.
* [libssh] Correct pthread naming on windows.
* [fontconfig] Add libintl to pkgconfig on windows.
* update version records
* [ffmpeg] Fixup FindFFmpeg.
* [ffmpeg] speex now supports non-windows.
* [ffmpeg] Add feature libass.
* [ffmpeg] Add dav1d feature.
* [ffmpeg] Add feature ilbc.
* [ffmpeg] Add tensorflow feature.
* [ffmpeg] update version record.
* [ffmpeg] Add CI feature test.
* [ffmpeg] Limit features based on CI failures.
* [ffmpeg] Update version record.
* [ffmpeg] limit features based on ci.baseline.
* [various ports] Update supports field.
* [ffmpeg] Limit features more based on CI.
* update version records.
* [ffmpeg] Add detection of additional non target deps..
select_library_configurations_from_names currently detects the debug libs even for release builds as _IMPORT_PREFIX was not being set.
* [aubio] Silence warning about FindFFMPEG.
* [pangolin] Use vcpkg supplied FindFFMPEG.
* update version files.
* [ffnvcodec] Set as not supporting uwp.
ffnvcodec will build under uwp as its a header only lib, but it can not be used as it requires dynamic dll loading.
* [ffmpeg] Update feature all.
* update version records
* [tesseract] Wrap debug pkgcfg update.
* [libssh,libxml2,openjpeg,fontconfig] Fix pkg-config for release only triplets.
* [libssh] Correct port version after merge.
* [ffmpeg] Fixup after merge.
* Update version files.
* [ffmpeg] Add opengl support.
* [ffmpeg] Update package version.
* [ffmpeg] Fix ffnvcodec support.
* [ffmpeg] Fix x265 detection on osx.
* [libvpx] Enable arm-uwp build.
* [ffmpeg] Fixup x265 patch.
* trigger sdl rebuild
* [ffmpeg] Disable opengl on osx.
* Revert "trigger sdl rebuild"
This reverts commit 94065bfe8414259ad5a5576bd4ac0b7ab4b97c6b.
* [ffmpeg] Disable failing features on osx.
* Update ports/ffmpeg/FindFFMPEG.cmake.in
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
* [ffmpeg] Add ass dependencies to FindFFmpeg.
* Update ports/ffmpeg/FindFFMPEG.cmake.in
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
* update version
* [fontconfig] disable pthread/json as they are not needed for lib builds.
Only used for tests.
* [ffmpeg] Enable fontconfig on static+windows.
* update versions
* update versions.
* Fix incorrectly included commits
* revert pangolin commit
Reverts most of 2543be2edf60bf38511c2d477bb17b617398a108
* update versions
* Correct port version after merge.
* update versions.
* [ffmpeg] Fix cmake dependency detection on non-windows.
* Revert "revert pangolin commit"
This reverts commit f59bc5a53ea74fd9df17fc368886e9d1a80ac42f.
* [ffmpeg] Fix dependency loading that does not define separate debug/release libs.
* update versions.
* [ffmpeg] set CMP0072 policy.
* [wavpack] Fix cmake config export.
* [ffmpeg] Add optional system dependent libraries.
* update versions after merge.
* update versions.
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
2021-04-08 01:06:55 +08:00
|
|
|
COMPONENT
|
|
|
|
|
pkgconfig
|
|
|
|
|
)
|
2022-10-26 11:45:19 +08:00
|
|
|
-endif (UNIX OR MINGW)
|
[ffmpeg] Add support for dav1d,fontconfig,freetype,fribidi,ilbc,modplug,opengl,openjpeg,libssh,tensorflow,tesseract,webp,libxml2 dependencies. (#15787)
* [tesseract] Use vcpkg_fixup_pkgconfig.
* [libxml2] Correct pkgconfig lib name.
* [libwebp] Use vcpkg_fixup_pkgconfig.
* [libssh] Export pkgconfig on windows.
Also move to using git to get source.
* [modplug] Export pkgconfig on windows.
* [ffmpeg] Add support for fontconfig,freetype,fribidi,modplug,openjpeg,libssh,tesseract,libxml2 dependencies.
* [openjpeg] Correct required static link libs in pkgconfig.
* [modplug] Combine vcpkg_from_github using variable.
* Update ports/libssh/CONTROL
* Improve portfile.cmake
* update version records.
* [openjpeg] Update libs in pkgcfg.
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* update version records
* [libssh] Add pthread to pkgconfig when using mbedtls.
* [libssh] Correct pthread naming on windows.
* [fontconfig] Add libintl to pkgconfig on windows.
* update version records
* [ffmpeg] Fixup FindFFmpeg.
* [ffmpeg] speex now supports non-windows.
* [ffmpeg] Add feature libass.
* [ffmpeg] Add dav1d feature.
* [ffmpeg] Add feature ilbc.
* [ffmpeg] Add tensorflow feature.
* [ffmpeg] update version record.
* [ffmpeg] Add CI feature test.
* [ffmpeg] Limit features based on CI failures.
* [ffmpeg] Update version record.
* [ffmpeg] limit features based on ci.baseline.
* [various ports] Update supports field.
* [ffmpeg] Limit features more based on CI.
* update version records.
* [ffmpeg] Add detection of additional non target deps..
select_library_configurations_from_names currently detects the debug libs even for release builds as _IMPORT_PREFIX was not being set.
* [aubio] Silence warning about FindFFMPEG.
* [pangolin] Use vcpkg supplied FindFFMPEG.
* update version files.
* [ffnvcodec] Set as not supporting uwp.
ffnvcodec will build under uwp as its a header only lib, but it can not be used as it requires dynamic dll loading.
* [ffmpeg] Update feature all.
* update version records
* [tesseract] Wrap debug pkgcfg update.
* [libssh,libxml2,openjpeg,fontconfig] Fix pkg-config for release only triplets.
* [libssh] Correct port version after merge.
* [ffmpeg] Fixup after merge.
* Update version files.
* [ffmpeg] Add opengl support.
* [ffmpeg] Update package version.
* [ffmpeg] Fix ffnvcodec support.
* [ffmpeg] Fix x265 detection on osx.
* [libvpx] Enable arm-uwp build.
* [ffmpeg] Fixup x265 patch.
* trigger sdl rebuild
* [ffmpeg] Disable opengl on osx.
* Revert "trigger sdl rebuild"
This reverts commit 94065bfe8414259ad5a5576bd4ac0b7ab4b97c6b.
* [ffmpeg] Disable failing features on osx.
* Update ports/ffmpeg/FindFFMPEG.cmake.in
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
* [ffmpeg] Add ass dependencies to FindFFmpeg.
* Update ports/ffmpeg/FindFFMPEG.cmake.in
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
* update version
* [fontconfig] disable pthread/json as they are not needed for lib builds.
Only used for tests.
* [ffmpeg] Enable fontconfig on static+windows.
* update versions
* update versions.
* Fix incorrectly included commits
* revert pangolin commit
Reverts most of 2543be2edf60bf38511c2d477bb17b617398a108
* update versions
* Correct port version after merge.
* update versions.
* [ffmpeg] Fix cmake dependency detection on non-windows.
* Revert "revert pangolin commit"
This reverts commit f59bc5a53ea74fd9df17fc368886e9d1a80ac42f.
* [ffmpeg] Fix dependency loading that does not define separate debug/release libs.
* update versions.
* [ffmpeg] set CMP0072 policy.
* [wavpack] Fix cmake config export.
* [ffmpeg] Add optional system dependent libraries.
* update versions after merge.
* update versions.
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Matthias C. M. Troffaes <matthias.troffaes@gmail.com>
2021-04-08 01:06:55 +08:00
|
|
|
|
|
|
|
|
# CMake config files
|
|
|
|
|
include(CMakePackageConfigHelpers)
|
2024-07-08 22:25:27 +08:00
|
|
|
diff --git a/libssh.pc.cmake b/libssh.pc.cmake
|
|
|
|
|
index f288b94..759525c 100644
|
|
|
|
|
--- a/libssh.pc.cmake
|
|
|
|
|
+++ b/libssh.pc.cmake
|
|
|
|
|
@@ -7,4 +7,6 @@ Name: @PROJECT_NAME@
|
|
|
|
|
Description: The SSH Library
|
|
|
|
|
Version: @PROJECT_VERSION@
|
|
|
|
|
Libs: -L${libdir} -lssh
|
|
|
|
|
+Libs.private: @PC_LIBS_PRIVATE@
|
|
|
|
|
+Requires.private: @PC_REQUIRES_PRIVATE@
|
|
|
|
|
Cflags: -I${includedir}
|
|
|
|
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
|
|
|
index 807313b..72ef059 100644
|
|
|
|
|
--- a/src/CMakeLists.txt
|
|
|
|
|
+++ b/src/CMakeLists.txt
|
|
|
|
|
@@ -94,6 +94,8 @@ if (WIN32)
|
|
|
|
|
iphlpapi
|
|
|
|
|
ws2_32
|
|
|
|
|
)
|
|
|
|
|
+ string(APPEND PC_LIBS_PRIVATE " -liphlpapi -lws2_32 -lshell32 -ladvapi32")
|
|
|
|
|
+ set(PC_LIBS_PRIVATE "${PC_LIBS_PRIVATE}" PARENT_SCOPE)
|
|
|
|
|
endif (WIN32)
|
|
|
|
|
|
|
|
|
|
if (BUILD_STATIC_LIB)
|