summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2012-01-09 19:09:19 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2012-01-09 19:09:19 (GMT)
commit13cf995549eb8dda381e9dba08ac5cf59c69d0d0 (patch)
treee033cd7261dc4a587edb3a60bac10f9d1d2e6fa0 /Modules
parent7bfc71b70bf76ed8350ca778941b6db6e8d31940 (diff)
parent85d4d5e6ce941a6ec07de7cdbf1677d0b730bd44 (diff)
downloadCMake-13cf995549eb8dda381e9dba08ac5cf59c69d0d0.zip
CMake-13cf995549eb8dda381e9dba08ac5cf59c69d0d0.tar.gz
CMake-13cf995549eb8dda381e9dba08ac5cf59c69d0d0.tar.bz2
Merge topic 'doxygen-version-12648'
85d4d5e FindDoxygen: add DOXYGEN_VERSION variable
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindDoxygen.cmake7
1 files changed, 6 insertions, 1 deletions
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...