mirror of https://github.com/google/brotli
Merge branch 'master' into dependabot/github_actions/ossf/scorecard-action-2.3.1
This commit is contained in:
commit
a6eacaa3e3
|
@ -114,7 +114,7 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
|
||||||
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||||
add_definitions(-DOS_MACOSX)
|
add_definitions(-DOS_MACOSX)
|
||||||
set(CMAKE_MACOS_RPATH TRUE)
|
set(CMAKE_MACOS_RPATH TRUE)
|
||||||
set(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
|
set(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(BROTLI_EMSCRIPTEN)
|
if(BROTLI_EMSCRIPTEN)
|
||||||
|
@ -362,11 +362,11 @@ endif() # BROTLI_BUNDLED_MODE
|
||||||
|
|
||||||
if (BROTLI_BUILD_TOOLS)
|
if (BROTLI_BUILD_TOOLS)
|
||||||
install(FILES "docs/brotli.1"
|
install(FILES "docs/brotli.1"
|
||||||
DESTINATION "${SHARE_INSTALL_PREFIX}/man/man1")
|
DESTINATION "${CMAKE_INSTALL_FULL_MANDIR}/man1")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
install(FILES docs/constants.h.3 docs/decode.h.3 docs/encode.h.3 docs/types.h.3
|
install(FILES docs/constants.h.3 docs/decode.h.3 docs/encode.h.3 docs/types.h.3
|
||||||
DESTINATION "${SHARE_INSTALL_PREFIX}/man/man3")
|
DESTINATION "${CMAKE_INSTALL_FULL_MANDIR}/man3")
|
||||||
|
|
||||||
if (ENABLE_COVERAGE STREQUAL "yes")
|
if (ENABLE_COVERAGE STREQUAL "yes")
|
||||||
setup_target_for_coverage(coverage test coverage)
|
setup_target_for_coverage(coverage test coverage)
|
||||||
|
|
Loading…
Reference in New Issue