diff options
| author | Frédéric Brière <fbriere@fbriere.net> | 2017-01-16 18:36:54 -0500 |
|---|---|---|
| committer | Frédéric Brière <fbriere@fbriere.net> | 2018-02-09 11:36:42 -0500 |
| commit | d219c8550304de4087fd5645b2fda6407934aa7a (patch) | |
| tree | 1198ed1ad72120ed7ea60fe9952565849d26d931 | |
| parent | a00e899482c630bf489fe5692a1168ead20965bb (diff) | |
| download | twinkle-d219c8550304de4087fd5645b2fda6407934aa7a.tar twinkle-d219c8550304de4087fd5645b2fda6407934aa7a.tar.gz twinkle-d219c8550304de4087fd5645b2fda6407934aa7a.tar.lz twinkle-d219c8550304de4087fd5645b2fda6407934aa7a.tar.xz twinkle-d219c8550304de4087fd5645b2fda6407934aa7a.zip | |
Don't require file(1) when checking for libmagic
Attempting to compile Twinkle on a system where file(1) is not available
currently produces a confusing error message about libmagic not being
found.
The only reason to require file(1) was to obtain the libmagic version,
as the MAGIC_VERSION constant was apparently only introduced in 5.13.
But since we don't need any particular version, we might as well drop
this requirement.
Using find_program() instead of find_path() avoids picking
/usr/include/file by mistake, which resulted in a (harmless) empty
version string in the CMake output.
(Thanks to https://bro-tracker.atlassian.net/browse/BIT-1096 for
providing some of this information.)
| -rw-r--r-- | cmake/FindLibMagic.cmake | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/cmake/FindLibMagic.cmake b/cmake/FindLibMagic.cmake index ba0abd6..40e5655 100644 --- a/cmake/FindLibMagic.cmake +++ b/cmake/FindLibMagic.cmake @@ -13,9 +13,9 @@ # # Variables defined by this module: # -# LIBMAGIC_FOUND System has libmagic, magic.h, and file -# LibMagic_FILE_EXE Path to the 'file' command -# LibMagic_VERSION Version of libmagic +# LIBMAGIC_FOUND System has libmagic and magic.h +# LibMagic_FILE_EXE Path to the 'file' command (if available) +# LibMagic_VERSION Version of libmagic (if available) # LibMagic_LIBRARY The libmagic library # LibMagic_INCLUDE_DIR The location of magic.h @@ -31,7 +31,7 @@ else () set(libmagic_names magic) endif () -find_file(LibMagic_FILE_EXE +find_program(LibMagic_FILE_EXE NAMES file HINTS ${LibMagic_ROOT_DIR}/bin ) @@ -61,8 +61,6 @@ include(FindPackageHandleStandardArgs) find_package_handle_standard_args(LibMagic DEFAULT_MSG LibMagic_LIBRARY LibMagic_INCLUDE_DIR - LibMagic_FILE_EXE - LibMagic_VERSION ) mark_as_advanced( |