[Cmake-commits] CMake branch, next, updated. v2.8.8-2958-g691c38d
Mario Bensi
mbensi at ipsquad.net
Thu May 31 02:54:09 EDT 2012
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, next has been updated
via 691c38dab7482bfd9a10778c0edd9c6595086255 (commit)
via 6fcd26923205e46f0446103cc4f69c9f4f1f8f9e (commit)
via f1eee26be3252e7486a54f219ef8b5e345120fc5 (commit)
via 48a09755a06d32481ea2a2b22ed9bf579ae8a61d (commit)
from 15dc69afa4dd3c8670b6e0472af9c08ec03c5440 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=691c38dab7482bfd9a10778c0edd9c6595086255
commit 691c38dab7482bfd9a10778c0edd9c6595086255
Merge: 15dc69a 6fcd269
Author: Mario Bensi <mbensi at ipsquad.net>
AuthorDate: Thu May 31 02:54:06 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 31 02:54:06 2012 -0400
Merge topic 'moduleLibLzma' into next
6fcd269 Add LibLZMA Module
f1eee26 CMake Nightly Date Stamp
48a0975 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6fcd26923205e46f0446103cc4f69c9f4f1f8f9e
commit 6fcd26923205e46f0446103cc4f69c9f4f1f8f9e
Author: Mario Bensi <mbensi at ipsquad.net>
AuthorDate: Thu May 31 08:47:10 2012 +0200
Commit: Mario Bensi <mbensi at ipsquad.net>
CommitDate: Thu May 31 08:47:10 2012 +0200
Add LibLZMA Module
diff --git a/Modules/FindLibLZMA.cmake b/Modules/FindLibLZMA.cmake
new file mode 100644
index 0000000..c647436
--- /dev/null
+++ b/Modules/FindLibLZMA.cmake
@@ -0,0 +1,62 @@
+# - Find LibLZMA
+# Find LibLZMA headers and library
+#
+# LIBLZMA_FOUND - True if liblzma is found.
+# LIBLZMA_INCLUDE_DIRS - Directory where liblzma headers are located.
+# LIBLZMA_LIBRARIES - Lzma libraries to link against.
+# LIBLZMA_HAS_AUTO_DECODER - True if lzma_auto_decoder() is found (required).
+# LIBLZMA_HAS_EASY_ENCODER - True if lzma_easy_encoder() is found (required).
+# LIBLZMA_HAS_LZMA_PRESET - True if lzma_lzma_preset() is found (required).
+# LIBLZMA_VERSION_MAJOR - The major version of lzma
+# LIBLZMA_VERSION_MINOR - The minor version of lzma
+# LIBLZMA_VERSION_PATCH - The patch version of lzma
+# LIBLZMA_VERSION_STRING - version number as a string (ex: "5.0.3")
+
+
+# Copyright (c) 2008, Per Øyvind Karlsen, <peroyvind at mandriva.org>
+# Copyright (c) 2009, Alexander Neundorf, <neundorf at kde.org>
+# Copyright (c) 2009, Helio Chissini de Castro, <helio at kde.org>
+# Copyright (c) 2012, Mario Bensi, <mbensi at ipsquad.net>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+
+FIND_PATH(LIBLZMA_INCLUDE_DIR lzma.h )
+FIND_LIBRARY(LIBLZMA_LIBRARY lzma)
+
+IF(LIBLZMA_INCLUDE_DIR AND EXISTS "${LIBLZMA_INCLUDE_DIR}/lzma/version.h")
+ FILE(READ "${LIBLZMA_INCLUDE_DIR}/lzma/version.h" LIBLZMA_HEADER_CONTENTS)
+
+ STRING(REGEX REPLACE ".*#define LZMA_VERSION_MAJOR ([0-9]+).*" "\\1" LIBLZMA_VERSION_MAJOR "${LIBLZMA_HEADER_CONTENTS}")
+ STRING(REGEX REPLACE ".*#define LZMA_VERSION_MINOR ([0-9]+).*" "\\1" LIBLZMA_VERSION_MINOR "${LIBLZMA_HEADER_CONTENTS}")
+ STRING(REGEX REPLACE ".*#define LZMA_VERSION_PATCH ([0-9]+).*" "\\1" LIBLZMA_VERSION_PATCH "${LIBLZMA_HEADER_CONTENTS}")
+
+ SET(LIBLZMA_VERSION_STRING "${LIBLZMA_VERSION_MAJOR}.${LIBLZMA_VERSION_MINOR}.${LIBLZMA_VERSION_PATCH}")
+ENDIF(LIBLZMA_INCLUDE_DIR AND EXISTS "${LIBLZMA_INCLUDE_DIR}/lzma/version.h")
+
+# We're using new code known now as XZ, even library still been called LZMA
+# it can be found in http://tukaani.org/xz/
+# Avoid using old codebase
+IF (LIBLZMA_LIBRARY)
+ INCLUDE(CheckLibraryExists)
+ CHECK_LIBRARY_EXISTS(${LIBLZMA_LIBRARY} lzma_auto_decoder "" LIBLZMA_HAS_AUTO_DECODER)
+ CHECK_LIBRARY_EXISTS(${LIBLZMA_LIBRARY} lzma_easy_encoder "" LIBLZMA_HAS_EASY_ENCODER)
+ CHECK_LIBRARY_EXISTS(${LIBLZMA_LIBRARY} lzma_lzma_preset "" LIBLZMA_HAS_LZMA_PRESET)
+ENDIF (LIBLZMA_LIBRARY)
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibLZMA REQUIRED_VARS LIBLZMA_INCLUDE_DIR
+ LIBLZMA_LIBRARY
+ LIBLZMA_HAS_AUTO_DECODER
+ LIBLZMA_HAS_EASY_ENCODER
+ LIBLZMA_HAS_LZMA_PRESET
+ VERSION_VAR LIBLZMA_VERSION_STRING
+ )
+
+IF (LIBLZMA_FOUND)
+ SET(LIBLZMA_LIBRARIES ${LIBLZMA_LIBRARY})
+ SET(LIBLZMA_INCLUDE_DIRS ${LIBLZMA_INCLUDE_DIR})
+ENDIF (LIBLZMA_FOUND)
+
+MARK_AS_ADVANCED( LIBLZMA_INCLUDE_DIR LIBLZMA_LIBRARY )
diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
index fc65e58..551cee3 100644
--- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
+++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
@@ -71,7 +71,7 @@ endmacro(check_version_string)
# reported.
foreach(VTEST ALSA ARMADILLO BZIP2 CUPS CURL EXPAT FREETYPE GETTEXT GIT HSPELL
- JASPER LIBXML2 LIBXSLT PERL PKG_CONFIG PostgreSQL TIFF ZLIB)
+ JASPER LIBLZMA LIBXML2 LIBXSLT PERL PKG_CONFIG PostgreSQL TIFF ZLIB)
check_version_string(${VTEST} ${VTEST}_VERSION_STRING)
endforeach(VTEST)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindLibLZMA.cmake | 62 +++++++++++++++++++++++++
Source/CMakeVersion.cmake | 2 +-
Tests/CMakeOnly/AllFindModules/CMakeLists.txt | 2 +-
3 files changed, 64 insertions(+), 2 deletions(-)
create mode 100644 Modules/FindLibLZMA.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list