forked from microsoft/vcpkg
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[asmjit][botan][brotli] Update version (microsoft#13676)
- Loading branch information
Showing
9 changed files
with
83 additions
and
101 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 |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| Source: asmjit | ||
| Version: 2020-07-22 | ||
| Version: 2020-09-14 | ||
| Homepage: https://github.com/asmjit/asmjit | ||
| Description: Complete x86/x64 JIT and Remote Assembler for C++ | ||
| Supports: !arm |
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 |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| Source: botan | ||
| Version: 2.12.1-1 | ||
| Version: 2.15.0 | ||
| Homepage: https://botan.randombit.net | ||
| Description: A cryptography library written in C++11 |
This file was deleted.
Oops, something went wrong.
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 |
|---|---|---|
| @@ -1,5 +1,4 @@ | ||
| Source: brotli | ||
| Version: 1.0.7 | ||
| Port-Version: 3 | ||
| Version: 1.0.9 | ||
| Homepage: https://github.com/google/brotli | ||
| Description: a generic-purpose lossless compression algorithm that compresses data using a combination of a modern variant of the LZ77 algorithm, Huffman coding and 2nd order context modeling. |
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 |
|---|---|---|
| @@ -1,56 +1,58 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index ac55f6b..e016967 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -166,12 +166,11 @@ endforeach() | ||
|
|
||
| foreach(lib brotlicommon brotlidec brotlienc brotlicommon-static brotlidec-static brotlienc-static) | ||
| target_link_libraries(${lib} ${LIBM_LIBRARY}) | ||
| - set_property(TARGET ${lib} APPEND PROPERTY INCLUDE_DIRECTORIES ${BROTLI_INCLUDE_DIRS}) | ||
| set_target_properties(${lib} PROPERTIES | ||
| VERSION "${BROTLI_ABI_COMPATIBILITY}.${BROTLI_ABI_AGE}.${BROTLI_ABI_REVISION}" | ||
| SOVERSION "${BROTLI_ABI_COMPATIBILITY}" | ||
| POSITION_INDEPENDENT_CODE TRUE) | ||
| - set_property(TARGET ${lib} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${BROTLI_INCLUDE_DIRS}") | ||
| + set_property(TARGET ${lib} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${BROTLI_INCLUDE_DIRS}>" $<INSTALL_INTERFACE:include>) | ||
| endforeach() | ||
|
|
||
| target_link_libraries(brotlidec brotlicommon) | ||
| @@ -199,27 +198,35 @@ target_link_libraries(brotli ${BROTLI_LIBRARIES_STATIC}) | ||
| if(NOT BROTLI_BUNDLED_MODE) | ||
| install( | ||
| TARGETS brotli | ||
| - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" | ||
| + RUNTIME DESTINATION tools/brotli | ||
| + CONFIGURATIONS Release | ||
| ) | ||
|
|
||
| + if(BUILD_SHARED_LIBS) | ||
| install( | ||
| TARGETS ${BROTLI_LIBRARIES_CORE} | ||
| + EXPORT brotli | ||
| ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" | ||
| LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" | ||
| RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" | ||
| ) | ||
| - | ||
| + else() | ||
| install( | ||
| TARGETS ${BROTLI_LIBRARIES_CORE_STATIC} | ||
| + EXPORT brotli | ||
| ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" | ||
| LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" | ||
| RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" | ||
| ) | ||
| + endif() | ||
|
|
||
| install( | ||
| DIRECTORY ${BROTLI_INCLUDE_DIRS}/brotli | ||
| DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" | ||
| + CONFIGURATIONS Release | ||
| ) | ||
| + | ||
| + install(EXPORT brotli FILE unofficial-brotli-config.cmake NAMESPACE unofficial::brotli:: DESTINATION share/unofficial-brotli) | ||
| endif() | ||
|
|
||
| # Tests | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 4ff3401..46492d0 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -185,14 +185,13 @@ endforeach() | ||
|
|
||
| foreach(lib IN LISTS BROTLI_SHARED_LIBS BROTLI_STATIC_LIBS) | ||
| target_link_libraries(${lib} ${LIBM_LIBRARY}) | ||
| - set_property(TARGET ${lib} APPEND PROPERTY INCLUDE_DIRECTORIES ${BROTLI_INCLUDE_DIRS}) | ||
| set_target_properties(${lib} PROPERTIES | ||
| VERSION "${BROTLI_ABI_COMPATIBILITY}.${BROTLI_ABI_AGE}.${BROTLI_ABI_REVISION}" | ||
| SOVERSION "${BROTLI_ABI_COMPATIBILITY}") | ||
| if(NOT BROTLI_EMSCRIPTEN) | ||
| set_target_properties(${lib} PROPERTIES POSITION_INDEPENDENT_CODE TRUE) | ||
| endif() | ||
| - set_property(TARGET ${lib} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${BROTLI_INCLUDE_DIRS}") | ||
| + set_property(TARGET ${lib} APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${BROTLI_INCLUDE_DIRS}>" $<INSTALL_INTERFACE:include>) | ||
| endforeach() | ||
|
|
||
| if(NOT BROTLI_EMSCRIPTEN) | ||
| @@ -223,27 +222,35 @@ if(NOT BROTLI_EMSCRIPTEN) | ||
| if(NOT BROTLI_BUNDLED_MODE) | ||
| install( | ||
| TARGETS brotli | ||
| - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" | ||
| + RUNTIME DESTINATION tools/brotli | ||
| + CONFIGURATIONS Release | ||
| ) | ||
|
|
||
| + if(BUILD_SHARED_LIBS) | ||
| install( | ||
| TARGETS ${BROTLI_LIBRARIES_CORE} | ||
| + EXPORT brotli | ||
| ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" | ||
| LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" | ||
| RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" | ||
| ) | ||
| - | ||
| + else() | ||
| install( | ||
| TARGETS ${BROTLI_LIBRARIES_CORE_STATIC} | ||
| + EXPORT brotli | ||
| ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" | ||
| LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" | ||
| RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" | ||
| ) | ||
| + endif() | ||
|
|
||
| install( | ||
| DIRECTORY ${BROTLI_INCLUDE_DIRS}/brotli | ||
| DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" | ||
| + CONFIGURATIONS Release | ||
| ) | ||
| + | ||
| + install(EXPORT brotli FILE unofficial-brotli-config.cmake NAMESPACE unofficial::brotli:: DESTINATION share/unofficial-brotli) | ||
| endif() # BROTLI_BUNDLED_MODE | ||
| endif() # BROTLI_EMSCRIPTEN | ||
|
|
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