mirror of
https://github.com/microsoft/vcpkg.git
synced 2026-01-18 01:11:23 +01:00
81 lines
3.0 KiB
Diff
81 lines
3.0 KiB
Diff
diff --git a/cmake/exiv2Config.cmake.in b/cmake/exiv2Config.cmake.in
|
|
index 09b46df..85badd2 100644
|
|
--- a/cmake/exiv2Config.cmake.in
|
|
+++ b/cmake/exiv2Config.cmake.in
|
|
@@ -9,7 +9,7 @@ if(NOT @BUILD_SHARED_LIBS@) # if(NOT BUILD_SHARED_LIBS)
|
|
endif()
|
|
|
|
if(@EXIV2_ENABLE_BMFF@ AND @EXIV2_ENABLE_BROTLI@) # if(EXIV2_ENABLE_BMFF AND EXIV2_ENABLE_BROTLI)
|
|
- find_package(Brotli QUIET)
|
|
+ find_dependency(Brotli NAMES unofficial-brotli)
|
|
if (NOT Brotli_FOUND)
|
|
message(FATAL_ERROR
|
|
"Static builds of exiv2 require Brotli. "
|
|
@@ -25,7 +25,7 @@ if(NOT @BUILD_SHARED_LIBS@) # if(NOT BUILD_SHARED_LIBS)
|
|
endif()
|
|
|
|
if(@EXIV2_ENABLE_XMP@) # if(EXIV2_ENABLE_XMP)
|
|
- find_dependency(EXPAT REQUIRED)
|
|
+ find_dependency(EXPAT NAMES expat)
|
|
elseif(@EXIV2_ENABLE_EXTERNAL_XMP@) # elseif(EXIV2_ENABLE_EXTERNAL_XMP)
|
|
find_dependency(XmpSdk REQUIRED)
|
|
endif()
|
|
@@ -39,7 +39,7 @@ if(NOT @BUILD_SHARED_LIBS@) # if(NOT BUILD_SHARED_LIBS)
|
|
endif()
|
|
|
|
if(@EXIV2_ENABLE_INIH@) # if(EXIV2_ENABLE_INIH)
|
|
- find_package(inih QUIET)
|
|
+ find_dependency(inih NAMES unofficial-inih)
|
|
if (NOT inih_FOUND)
|
|
message(FATAL_ERROR
|
|
"Static builds of exiv2 require inih. "
|
|
diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake
|
|
index b0897c3..e559666 100644
|
|
--- a/cmake/findDependencies.cmake
|
|
+++ b/cmake/findDependencies.cmake
|
|
@@ -49,7 +49,8 @@ if( EXIV2_ENABLE_PNG )
|
|
endif( )
|
|
|
|
if( EXIV2_ENABLE_BMFF AND EXIV2_ENABLE_BROTLI )
|
|
- find_package( Brotli REQUIRED )
|
|
+ find_package(BROTLI NAMES unofficial-brotli REQUIRED)
|
|
+ set(Brotli_LIBRARIES unofficial::brotli::brotlidec)
|
|
endif( )
|
|
|
|
if( EXIV2_ENABLE_WEBREADY )
|
|
@@ -62,7 +63,9 @@ if (EXIV2_ENABLE_XMP AND EXIV2_ENABLE_EXTERNAL_XMP)
|
|
message(FATAL_ERROR "EXIV2_ENABLE_XMP AND EXIV2_ENABLE_EXTERNAL_XMP are mutually exclusive. You can only choose one of them")
|
|
else()
|
|
if (EXIV2_ENABLE_XMP)
|
|
- find_package(EXPAT REQUIRED)
|
|
+ find_package(EXPAT NAMES expat REQUIRED)
|
|
+ add_library(EXPAT::EXPAT ALIAS expat::expat)
|
|
+ set(EXPAT_LIBRARIES expat::expat)
|
|
elseif (EXIV2_ENABLE_EXTERNAL_XMP)
|
|
find_package(XmpSdk REQUIRED)
|
|
endif ()
|
|
@@ -79,7 +82,9 @@ if( ICONV_FOUND )
|
|
endif()
|
|
|
|
if( EXIV2_ENABLE_INIH )
|
|
- find_package(inih)
|
|
+ find_package(unofficial-inih CONFIG REQUIRED)
|
|
+ add_library(inih::libinih ALIAS unofficial::inih::libinih)
|
|
+ add_library(inih::inireader ALIAS unofficial::inih::inireader)
|
|
message ( "-- inih_INCLUDE_DIRS : " ${inih_INCLUDE_DIRS} )
|
|
message ( "-- inih_LIBRARIES : " ${inih_LIBRARIES} )
|
|
message ( "-- inih_inireader_INCLUDE_DIRS : " ${inih_inireader_INCLUDE_DIRS} )
|
|
diff --git a/xmpsdk/CMakeLists.txt b/xmpsdk/CMakeLists.txt
|
|
index 87c59c0..613c49b 100644
|
|
--- a/xmpsdk/CMakeLists.txt
|
|
+++ b/xmpsdk/CMakeLists.txt
|
|
@@ -32,6 +32,8 @@ target_include_directories(exiv2-xmp SYSTEM
|
|
${EXPAT_INCLUDE_DIRS}
|
|
)
|
|
|
|
+target_link_libraries(exiv2-xmp PRIVATE expat::expat)
|
|
+
|
|
# Prevent a denial-service-attack related to XML entity expansion
|
|
# ("billion laughs attack").
|
|
# See https://bugzilla.redhat.com/show_bug.cgi?id=888769
|