mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-25 11:47:49 +08:00
deb4361235
<!-- If your PR fixes issues, please note that here by adding "Fixes #NNNNNN." for each fixed issue on separate lines. --> Fixes https://github.com/microsoft/vcpkg/issues/35941 The contents in the patch have been merged in upstream, so I remove them. No feature needs to be tested. <!-- If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/ --> - [x] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md) - [x] SHA512s are updated for each updated download - [ ] ~~The "supports" clause reflects platforms that may be fixed by this new version~~ - [ ] ~~Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file.~~ - [x] Any patches that are no longer applied are deleted from the port's directory. - [x] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [x] Only one version is added to each modified port's versions file. <!-- If this PR adds a new port, please uncomment and fill out this checklist: - [ ] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md) - [ ] The name of the port matches an existing name for this component on https://repology.org/ if possible, and/or is strongly associated with that component on search engines. - [ ] Optional dependencies are resolved in exactly one way. For example, if the component is built with CMake, all `find_package` calls are REQUIRED, are satisfied by `vcpkg.json`'s declared dependencies, or disabled with [CMAKE_DISABLE_FIND_PACKAGE_Xxx](https://cmake.org/cmake/help/latest/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.html) - [ ] The versioning scheme in `vcpkg.json` matches what upstream says. - [ ] The license declaration in `vcpkg.json` matches what upstream says. - [ ] The installed as the "copyright" file matches what upstream says. - [ ] The source code of the component installed comes from an authoritative source. - [ ] The generated "usage text" is accurate. See [adding-usage](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/examples/adding-usage.md) for context. - [ ] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [ ] Only one version is in the new port's versions file. - [ ] Only one version is added to each modified port's versions file. END OF NEW PORT CHECKLIST (delete this line) -->
62 lines
1.9 KiB
Diff
62 lines
1.9 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 58c70f4..93b983d 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -358,7 +358,7 @@ configure_file(lept.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/lept.pc.in @ONLY)
|
|
# to resolve generator expression in OUTPUT_NAME
|
|
file(
|
|
GENERATE
|
|
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lept_$<CONFIG>.pc
|
|
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lept.pc
|
|
INPUT ${CMAKE_CURRENT_BINARY_DIR}/lept.pc.in)
|
|
|
|
configure_file(
|
|
@@ -368,7 +368,7 @@ configure_file(
|
|
${CMAKE_CURRENT_SOURCE_DIR}/cmake/templates/LeptonicaConfig.cmake.in
|
|
${CMAKE_CURRENT_BINARY_DIR}/LeptonicaConfig.cmake @ONLY)
|
|
|
|
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/lept_$<CONFIG>.pc
|
|
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/lept.pc
|
|
DESTINATION lib/pkgconfig)
|
|
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/LeptonicaConfig.cmake
|
|
${CMAKE_CURRENT_BINARY_DIR}/LeptonicaConfig-version.cmake
|
|
diff --git a/cmake/Configure.cmake b/cmake/Configure.cmake
|
|
index da41b1b..a2d163a 100644
|
|
--- a/cmake/Configure.cmake
|
|
+++ b/cmake/Configure.cmake
|
|
@@ -94,7 +94,7 @@ if (JPEG_FOUND)
|
|
set(HAVE_LIBJPEG 1)
|
|
endif()
|
|
|
|
-if (OPENJPEG_SUPPORT)
|
|
+if (OpenJPEG_FOUND)
|
|
set(HAVE_LIBJP2K 1)
|
|
endif()
|
|
|
|
@@ -106,7 +106,7 @@ if (TIFF_FOUND)
|
|
set(HAVE_LIBTIFF 1)
|
|
endif()
|
|
|
|
-if (LIBWEBP_SUPPORT)
|
|
+if (WebP_FOUND)
|
|
set(HAVE_LIBWEBP 1)
|
|
set(HAVE_LIBWEBP_ANIM 1)
|
|
endif()
|
|
diff --git a/cmake/templates/LeptonicaConfig.cmake.in b/cmake/templates/LeptonicaConfig.cmake.in
|
|
index cee3a0f..8602931 100644
|
|
--- a/cmake/templates/LeptonicaConfig.cmake.in
|
|
+++ b/cmake/templates/LeptonicaConfig.cmake.in
|
|
@@ -21,10 +21,10 @@
|
|
# ===================================================================================
|
|
|
|
include(CMakeFindDependencyMacro)
|
|
-if (@OPENJPEG_SUPPORT@)
|
|
+if (@ENABLE_OPENJPEG@)
|
|
find_dependency(OpenJPEG CONFIG)
|
|
endif()
|
|
-if (@LIBWEBP_SUPPORT@)
|
|
+if (@ENABLE_WEBP@)
|
|
find_dependency(WebP @MINIMUM_WEBPMUX_VERSION@ CONFIG)
|
|
endif()
|
|
|