[Cmake-commits] CMake branch, master, updated. v3.10.1-644-g0816f74

[Kitware Robot]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  0816f7496b31829533419fa42932d00d9b0851ff (commit)
       via  de706fe0d47b8d6fd9ed269d6caedbbfb9b71258 (commit)
      from  438ed3bfc180fbee98fa07af1eb427c6da209b68 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0816f7496b31829533419fa42932d00d9b0851ff
commit 0816f7496b31829533419fa42932d00d9b0851ff
Merge: 438ed3b de706fe
Author:     Christian Pfeiffer <cpfeiffer at live.de>
AuthorDate: Mon Dec 18 22:05:17 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Dec 18 17:05:22 2017 -0500

    Merge topic 'findliblzma-win-name'
    
    de706fe0 FindLibLZMA: Add library name for Windows
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !1605


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=de706fe0d47b8d6fd9ed269d6caedbbfb9b71258
commit de706fe0d47b8d6fd9ed269d6caedbbfb9b71258
Author:     Christian Pfeiffer <cpfeiffer at live.de>
AuthorDate: Mon Dec 18 03:34:49 2017 +0100
Commit:     Christian Pfeiffer <cpfeiffer at live.de>
CommitDate: Mon Dec 18 03:34:49 2017 +0100

    FindLibLZMA: Add library name for Windows
    
    Fixes: #17568

diff --git a/Modules/FindLibLZMA.cmake b/Modules/FindLibLZMA.cmake
index 8009bcf..d203eaf 100644
--- a/Modules/FindLibLZMA.cmake
+++ b/Modules/FindLibLZMA.cmake
@@ -23,7 +23,7 @@
 #   LIBLZMA_VERSION_STRING    - version number as a string (ex: "5.0.3")
 
 find_path(LIBLZMA_INCLUDE_DIR lzma.h )
-find_library(LIBLZMA_LIBRARY lzma)
+find_library(LIBLZMA_LIBRARY NAMES lzma liblzma)
 
 if(LIBLZMA_INCLUDE_DIR AND EXISTS "${LIBLZMA_INCLUDE_DIR}/lzma/version.h")
     file(STRINGS "${LIBLZMA_INCLUDE_DIR}/lzma/version.h" LIBLZMA_HEADER_CONTENTS REGEX "#define LZMA_VERSION_[A-Z]+ [0-9]+")

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindLibLZMA.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake