forked from microsoft/vcpkg
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[exiv2] Update to 0.28 (microsoft#33126)
* [exiv2] Update to 0.28 * Fix static build usage
- Loading branch information
1 parent
7dbb5af
commit 81947d1
Showing
10 changed files
with
142 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake | ||
index 664522c2a..cbfa5d908 100644 | ||
--- a/cmake/findDependencies.cmake | ||
+++ b/cmake/findDependencies.cmake | ||
@@ -30,10 +30,12 @@ endif() | ||
|
||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/") | ||
|
||
+if(EXIV2_BUILD_UNIT_TESTS) | ||
find_package (Python3 COMPONENTS Interpreter) | ||
if (NOT Python3_Interpreter_FOUND) | ||
message(WARNING "Python3 was not found. Python tests under the 'tests' folder will not be executed") | ||
endif() | ||
+endif() | ||
|
||
find_package(Filesystem REQUIRED) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake | ||
index bec2128a5..664522c2a 100644 | ||
--- a/cmake/findDependencies.cmake | ||
+++ b/cmake/findDependencies.cmake | ||
@@ -47,7 +47,7 @@ if( EXIV2_ENABLE_PNG ) | ||
endif( ) | ||
|
||
if( EXIV2_ENABLE_BMFF AND EXIV2_ENABLE_BROTLI ) | ||
- find_package( Brotli REQUIRED ) | ||
+ find_package( BROTLI NAMES unofficial-brotli CONFIG REQUIRED ) | ||
endif( ) | ||
|
||
if( EXIV2_ENABLE_WEBREADY ) | ||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt | ||
index 15bab8c8a..3db5bdd08 100644 | ||
--- a/src/CMakeLists.txt | ||
+++ b/src/CMakeLists.txt | ||
@@ -240,8 +240,7 @@ if( EXIV2_ENABLE_PNG ) | ||
endif() | ||
|
||
if( EXIV2_ENABLE_BMFF AND BROTLI_FOUND ) | ||
- target_link_libraries( exiv2lib PRIVATE ${Brotli_LIBRARIES}) | ||
- target_include_directories(exiv2lib PRIVATE ${Brotli_INCLUDE_DIRS}) | ||
+ target_link_libraries( exiv2lib PRIVATE unofficial::brotli::brotlidec) | ||
list(APPEND requires_private_list "libbrotlidec") | ||
endif() | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt | ||
index 41a672e8..1311c856 100644 | ||
--- a/src/CMakeLists.txt | ||
+++ b/src/CMakeLists.txt | ||
@@ -182,7 +182,7 @@ target_include_directories(exiv2lib SYSTEM PRIVATE | ||
) | ||
|
||
if (EXIV2_ENABLE_XMP OR EXIV2_ENABLE_EXTERNAL_XMP) | ||
target_include_directories(exiv2lib PRIVATE ${EXPAT_INCLUDE_DIR}) | ||
- target_link_libraries(exiv2lib PRIVATE EXPAT::EXPAT) | ||
+ target_link_libraries(exiv2lib PRIVATE expat::expat) | ||
list(APPEND requires_private_list "expat") | ||
endif() | ||
|
||
if (EXIV2_ENABLE_XMP) | ||
diff --git a/xmpsdk/CMakeLists.txt b/xmpsdk/CMakeLists.txt | ||
index 9c148a61..0fed7cde 100644 | ||
--- a/xmpsdk/CMakeLists.txt | ||
+++ b/xmpsdk/CMakeLists.txt | ||
@@ -28,7 +28,7 @@ add_library(exiv2-xmp OBJECT | ||
|
||
target_link_libraries(exiv2-xmp | ||
PRIVATE | ||
- EXPAT::EXPAT | ||
+ expat::expat | ||
) | ||
|
||
target_include_directories(exiv2-xmp SYSTEM |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake | ||
index 1075c3031..bec2128a5 100644 | ||
--- a/cmake/findDependencies.cmake | ||
+++ b/cmake/findDependencies.cmake | ||
@@ -77,7 +77,7 @@ if( ICONV_FOUND ) | ||
endif() | ||
|
||
if( EXIV2_ENABLE_INIH ) | ||
- find_package(inih) | ||
+ find_package(unofficial-inih CONFIG REQUIRED) | ||
message ( "-- inih_INCLUDE_DIRS : " ${inih_INCLUDE_DIRS} ) | ||
message ( "-- inih_LIBRARIES : " ${inih_LIBRARIES} ) | ||
message ( "-- inih_inireader_INCLUDE_DIRS : " ${inih_inireader_INCLUDE_DIRS} ) | ||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt | ||
index dba7af99c..15bab8c8a 100644 | ||
--- a/src/CMakeLists.txt | ||
+++ b/src/CMakeLists.txt | ||
@@ -263,10 +263,10 @@ if( Iconv_FOUND AND Iconv_LIBRARIES ) | ||
endif() | ||
|
||
if( EXIV2_ENABLE_INIH ) | ||
- target_link_libraries( exiv2lib_int PRIVATE inih::libinih ) | ||
- target_link_libraries( exiv2lib_int PRIVATE inih::inireader ) | ||
- target_link_libraries( exiv2lib PRIVATE inih::libinih ) | ||
- target_link_libraries( exiv2lib PRIVATE inih::inireader ) | ||
+ target_link_libraries( exiv2lib_int PRIVATE unofficial::inih::libinih ) | ||
+ target_link_libraries( exiv2lib_int PRIVATE unofficial::inih::inireader ) | ||
+ target_link_libraries( exiv2lib PRIVATE unofficial::inih::libinih ) | ||
+ target_link_libraries( exiv2lib PRIVATE unofficial::inih::inireader ) | ||
list(APPEND requires_private_list "INIReader") | ||
endif() | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
exiv2 provides CMake targets: | ||
|
||
find_package(exiv2 CONFIG REQUIRED) | ||
target_link_libraries(main PRIVATE exiv2lib) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters