From 3fe2bc622e75c052e75c351621a8c876070481a3 Mon Sep 17 00:00:00 2001 From: Alex Neundorf Date: Sun, 4 Nov 2012 19:11:43 +0100 Subject: Squish: detect version Alex --- Modules/FindSquish.cmake | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/Modules/FindSquish.cmake b/Modules/FindSquish.cmake index a032496..032ed97 100644 --- a/Modules/FindSquish.cmake +++ b/Modules/FindSquish.cmake @@ -4,6 +4,10 @@ # # ---- Variables and Macros # SQUISH_FOUND If false, don't try to use Squish +# SQUISH_VERSION The full version of Squish found +# SQUISH_VERSION_MAJOR The major version of Squish found +# SQUISH_VERSION_MINOR The minor version of Squish found +# SQUISH_VERSION_PATCH The patch version of Squish found # # SQUISH_INSTALL_DIR The Squish installation directory (containing bin, lib, etc) # SQUISH_SERVER_EXECUTABLE The squishserver executable @@ -86,9 +90,24 @@ else() set(SQUISH_INSTALL_DIR_FOUND 0) endif() + +set(SQUISH_VERSION) +set(SQUISH_VERSION_MAJOR ) +set(SQUISH_VERSION_MINOR ) +set(SQUISH_VERSION_PATCH ) + # record if executables are set if(SQUISH_CLIENT_EXECUTABLE) set(SQUISH_CLIENT_EXECUTABLE_FOUND 1) + execute_process(COMMAND "${SQUISH_CLIENT_EXECUTABLE}" --version + OUTPUT_VARIABLE _squishVersionOutput + ERROR_QUIET ) + if("${_squishVersionOutput}" MATCHES "([0-9]+)\\.([0-9]+)\\.([0-9]+).*$") + set(SQUISH_VERSION_MAJOR "${CMAKE_MATCH_1}") + set(SQUISH_VERSION_MINOR "${CMAKE_MATCH_2}") + set(SQUISH_VERSION_PATCH "${CMAKE_MATCH_3}") + set(SQUISH_VERSION "${SQUISH_VERSION_MAJOR}.${SQUISH_VERSION_MINOR}.${SQUISH_VERSION_PATCH}" ) + endif() else() set(SQUISH_CLIENT_EXECUTABLE_FOUND 0) endif() -- cgit v0.12