[Cmake-commits] CMake branch, next, updated. v2.8.6-2343-gb8c1698

Rolf Eike Beer eike at sf-mail.de
Mon Jan 2 13:28:35 EST 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  b8c16980fc5917a5e73befc8a5737585ebeb35f8 (commit)
       via  85d4d5e6ce941a6ec07de7cdbf1677d0b730bd44 (commit)
      from  4da8984b409bd2000d72ec1f9a88a5b572aa805a (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=b8c16980fc5917a5e73befc8a5737585ebeb35f8
commit b8c16980fc5917a5e73befc8a5737585ebeb35f8
Merge: 4da8984 85d4d5e
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Jan 2 13:28:33 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 2 13:28:33 2012 -0500

    Merge topic 'doxygen-version-12648' into next
    
    85d4d5e FindDoxygen: add DOXYGEN_VERSION variable


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=85d4d5e6ce941a6ec07de7cdbf1677d0b730bd44
commit 85d4d5e6ce941a6ec07de7cdbf1677d0b730bd44
Author:     Yury G. Kudryashov <urkud.urkud at gmail.com>
AuthorDate: Mon Jan 2 18:47:19 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Jan 2 18:47:19 2012 +0100

    FindDoxygen: add DOXYGEN_VERSION variable
    
    Make it possible to write
    find_package(DOXYGEN X.Y.Z)

diff --git a/Modules/FindDoxygen.cmake b/Modules/FindDoxygen.cmake
index e5428ae..6cc9efb 100644
--- a/Modules/FindDoxygen.cmake
+++ b/Modules/FindDoxygen.cmake
@@ -11,6 +11,7 @@
 #
 #   DOXYGEN_EXECUTABLE     = The path to the doxygen command.
 #   DOXYGEN_FOUND          = Was Doxygen found or not?
+#   DOXYGEN_VERSION        = The version reported by doxygen --version
 #
 #   DOXYGEN_DOT_EXECUTABLE = The path to the dot program used by doxygen.
 #   DOXYGEN_DOT_FOUND      = Was Dot found or not?
@@ -76,8 +77,12 @@ FIND_PROGRAM(DOXYGEN_EXECUTABLE
   DOC "Doxygen documentation generation tool (http://www.doxygen.org)"
 )
 
+IF(DOXYGEN_EXECUTABLE)
+  EXECUTE_PROCESS(COMMAND ${DOXYGEN_EXECUTABLE} "--version" OUTPUT_VARIABLE DOXYGEN_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
+ENDIF()
+
 include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Doxygen DEFAULT_MSG DOXYGEN_EXECUTABLE)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Doxygen REQUIRED_VARS DOXYGEN_EXECUTABLE VERSION_VAR DOXYGEN_VERSION)
 
 #
 # Find Dot...

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

Summary of changes:
 Modules/FindDoxygen.cmake |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list