root
/
xz
mirror of https://git.tukaani.org/xz.git
1
0
Fork 0
Code Issues Releases Wiki Activity

CMake: Don't install scripts if the xz tool isn't built 

The scripts need the xz tool.
This commit is contained in:
Lasse Collin 2024-06-15 18:07:04 +03:00
parent fb50c6ba1d
commit 47aaa92516
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -2072,10 +2072,17 @@ endif()
# Scripts # Scripts
############################################################################# #############################################################################
set(ENABLE_SCRIPTS OFF)
if(UNIX) if(UNIX)
# NOTE: These depend on the xz tool and decoder support.
option(XZ_TOOL_SCRIPTS "Install the scripts \ option(XZ_TOOL_SCRIPTS "Install the scripts \
xzdiff, xzgrep, xzmore, xzless, and their symlinks" ON) xzdiff, xzgrep, xzmore, xzless, and their symlinks" ON)
if(XZ_TOOL_SCRIPTS AND XZ_TOOL_XZ AND HAVE_DECODERS)
set(ENABLE_SCRIPTS ON)
endif()
# NOTE: This isn't as sophisticated as in the Autotools build which # NOTE: This isn't as sophisticated as in the Autotools build which
# uses posix-shell.m4 but hopefully this doesn't need to be either. # uses posix-shell.m4 but hopefully this doesn't need to be either.
# CMake likely won't be used on as many (old) obscure systems as the # CMake likely won't be used on as many (old) obscure systems as the
@ -2120,7 +2127,7 @@ xzdiff, xzgrep, xzmore, xzless, and their symlinks" ON)
@ONLY @ONLY
NEWLINE_STYLE LF) NEWLINE_STYLE LF)
if(XZ_TOOL_SCRIPTS) if(ENABLE_SCRIPTS)
install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/${S}" install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/${S}"
DESTINATION "${CMAKE_INSTALL_BINDIR}" DESTINATION "${CMAKE_INSTALL_BINDIR}"
COMPONENT scripts_Runtime) COMPONENT scripts_Runtime)
@ -2137,7 +2144,7 @@ xzdiff, xzgrep, xzmore, xzless, and their symlinks" ON)
unset(POSIX_SHELL) unset(POSIX_SHELL)
unset(enable_path_for_scripts) unset(enable_path_for_scripts)
if(XZ_TOOL_SCRIPTS) if(ENABLE_SCRIPTS)
my_install_symlinks(scripts_Runtime "${CMAKE_INSTALL_BINDIR}" my_install_symlinks(scripts_Runtime "${CMAKE_INSTALL_BINDIR}"
xzdiff "" "${XZDIFF_LINKS}") xzdiff "" "${XZDIFF_LINKS}")

2
tests/tests.cmake
View File

@ -121,7 +121,7 @@ if(BUILD_TESTING)
endif() endif()
# test_scripts.sh only needs LZMA2 decoder and CRC32. # test_scripts.sh only needs LZMA2 decoder and CRC32.
if(UNIX AND HAVE_DECODERS) if(ENABLE_SCRIPTS)
file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/test_scripts") file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/test_scripts")
add_test(NAME test_scripts.sh add_test(NAME test_scripts.sh