diff options
| author | Luboš Doležel <lubos@dolezel.info> | 2018-02-09 18:27:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-09 18:27:51 +0100 |
| commit | 4f4f347eccab218b28bf46f8845315dc86f80927 (patch) | |
| tree | 1198ed1ad72120ed7ea60fe9952565849d26d931 | |
| parent | a00e899482c630bf489fe5692a1168ead20965bb (diff) | |
| parent | d219c8550304de4087fd5645b2fda6407934aa7a (diff) | |
| download | twinkle-4f4f347eccab218b28bf46f8845315dc86f80927.tar twinkle-4f4f347eccab218b28bf46f8845315dc86f80927.tar.gz twinkle-4f4f347eccab218b28bf46f8845315dc86f80927.tar.lz twinkle-4f4f347eccab218b28bf46f8845315dc86f80927.tar.xz twinkle-4f4f347eccab218b28bf46f8845315dc86f80927.zip | |
Merge pull request #106 from fbriere/bug/cmake-libmagic-file
Don't require file(1) when checking for libmagic
| -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( |