[Cmake-commits] CMake branch, next, updated. v2.8.6-1704-gf63f71c

[Alexander Neundorf]

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  f63f71ca82216825eeea9127e683f5e211a93b18 (commit)
       via  fe6d9c1a448c511559967a6f8467c84d75d89e64 (commit)
      from  fdd49dad034e99e44a3bd3ab35aa714704af27ff (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=f63f71ca82216825eeea9127e683f5e211a93b18
commit f63f71ca82216825eeea9127e683f5e211a93b18
Merge: fdd49da fe6d9c1
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Tue Oct 25 17:06:33 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 25 17:06:33 2011 -0400

    Merge topic 'FindLibXsltImprovements' into next
    
    fe6d9c1 FindLibXslt: also search libexslt and xsltproc


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fe6d9c1a448c511559967a6f8467c84d75d89e64
commit fe6d9c1a448c511559967a6f8467c84d75d89e64
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Tue Oct 25 23:03:17 2011 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Tue Oct 25 23:03:17 2011 +0200

    FindLibXslt: also search libexslt and xsltproc
    
    merging some changes FindLibXslt.cmake from KDE
    
    Alex

diff --git a/Modules/FindLibXslt.cmake b/Modules/FindLibXslt.cmake
index 462835a..1f49c3b 100644
--- a/Modules/FindLibXslt.cmake
+++ b/Modules/FindLibXslt.cmake
@@ -5,6 +5,9 @@
 #  LIBXSLT_INCLUDE_DIR - the LibXslt include directory
 #  LIBXSLT_LIBRARIES - Link these to LibXslt
 #  LIBXSLT_DEFINITIONS - Compiler switches required for using LibXslt
+# Additionally, the following two variables are set (but not required for using xslt):
+#  LIBXSLT_EXSLT_LIBRARIES - Link to these if you need to link against the exslt library
+#  LIBXSLT_XSLTPROC_EXECUTABLE - Contains the full path to the xsltproc executable if found
 
 #=============================================================================
 # Copyright 2006-2009 Kitware, Inc.
@@ -23,7 +26,7 @@
 # use pkg-config to get the directories and then use these values
 # in the FIND_PATH() and FIND_LIBRARY() calls
 FIND_PACKAGE(PkgConfig)
-PKG_CHECK_MODULES(PC_LIBXSLT libxslt)
+PKG_CHECK_MODULES(PC_LIBXSLT QUIET libxslt)
 SET(LIBXSLT_DEFINITIONS ${PC_LIBXSLT_CFLAGS_OTHER})
 
 FIND_PATH(LIBXSLT_INCLUDE_DIR NAMES libxslt/xslt.h
@@ -38,10 +41,22 @@ FIND_LIBRARY(LIBXSLT_LIBRARIES NAMES xslt libxslt
    ${PC_LIBXSLT_LIBRARY_DIRS}
   )
 
-# handle the QUIETLY and REQUIRED arguments and set LIBXML2_FOUND to TRUE if 
+FIND_LIBRARY(LIBXSLT_EXSLT_LIBRARY NAMES exslt libexslt
+    HINTS
+    ${PC_LIBXSLT_LIBDIR}
+    ${PC_LIBXSLT_LIBRARY_DIRS}
+  )
+
+SET(LIBXSLT_EXSLT_LIBRARIES ${LIBXSLT_EXSLT_LIBRARY} )
+
+FIND_PROGRAM(LIBXSLT_XSLTPROC_EXECUTABLE xsltproc)
+
+# handle the QUIETLY and REQUIRED arguments and set LIBXML2_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXslt DEFAULT_MSG LIBXSLT_LIBRARIES LIBXSLT_INCLUDE_DIR)
 
-MARK_AS_ADVANCED(LIBXSLT_INCLUDE_DIR LIBXSLT_LIBRARIES)
-
+MARK_AS_ADVANCED(LIBXSLT_INCLUDE_DIR
+                 LIBXSLT_LIBRARIES
+                 LIBXSLT_EXSLT_LIBRARY
+                 LIBXSLT_XSLTPROC_EXECUTABLE)

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

Summary of changes:
 Modules/FindLibXslt.cmake |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake