-
Notifications
You must be signed in to change notification settings - Fork 6.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
4aa3aab
commit 33286f9
Showing
4 changed files
with
71 additions
and
23 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,3 +1,3 @@ | ||
Source: brotli | ||
Version: 1.0.2-3 | ||
Version: 1.0.2-4 | ||
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 |
---|---|---|
@@ -0,0 +1,56 @@ | ||
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 |
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,11 @@ | ||
_find_package(${ARGS}) | ||
foreach(T brotlicommon brotlidec brotlienc) | ||
if(TARGET unofficial::brotli::${T} AND NOT TARGET unofficial::brotli::${T}-static) | ||
_add_library(unofficial::brotli::${T}-static INTERFACE IMPORTED) | ||
set_target_properties(unofficial::brotli::${T}-static PROPERTIES INTERFACE_LINK_LIBRARIES "unofficial::brotli::${T}") | ||
endif() | ||
if(NOT TARGET unofficial::brotli::${T} AND TARGET unofficial::brotli::${T}-static) | ||
_add_library(unofficial::brotli::${T} INTERFACE IMPORTED) | ||
set_target_properties(unofficial::brotli::${T} PROPERTIES INTERFACE_LINK_LIBRARIES "unofficial::brotli::${T}-static") | ||
endif() | ||
endforeach() |