[Cmake-commits] CMake branch, next, updated. v2.8.9-1107-gba089c0

[Aleksey Avdeev]

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  ba089c0be44c52fad406578bd08879a2c2ef5f99 (commit)
       via  86a184d8bb936037ff35b94075981cb1d40d49cb (commit)
       via  5ca5a09e06131579a8137d91366279a255afdcae (commit)
      from  07143613c21480b27691358128de269495a724da (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=ba089c0be44c52fad406578bd08879a2c2ef5f99
commit ba089c0be44c52fad406578bd08879a2c2ef5f99
Merge: 0714361 86a184d
Author:     Aleksey Avdeev <solo at altlinux.ru>
AuthorDate: Tue Oct 16 09:19:06 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 16 09:19:06 2012 -0400

    Merge topic 'FindIcotool' into next
    
    86a184d Add module FindIcotool
    5ca5a09 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86a184d8bb936037ff35b94075981cb1d40d49cb
commit 86a184d8bb936037ff35b94075981cb1d40d49cb
Author:     Aleksey Avdeev <solo at altlinux.ru>
AuthorDate: Tue Oct 16 16:06:32 2012 +0400
Commit:     Aleksey Avdeev <solo at altlinux.ru>
CommitDate: Tue Oct 16 16:06:32 2012 +0400

    Add module FindIcotool
    
    This module looks for icotool.
    
    Signed-off-by: Aleksey Avdeev <solo at altlinux.ru>

diff --git a/Modules/FindIcotool.cmake b/Modules/FindIcotool.cmake
new file mode 100644
index 0000000..8c10177
--- /dev/null
+++ b/Modules/FindIcotool.cmake
@@ -0,0 +1,56 @@
+# - Find icotool
+# This module looks for icotool. This module defines the
+# following values:
+#  ICOTOOL_EXECUTABLE: the full path to the icotool tool.
+#  ICOTOOL_FOUND: True if icotool has been found.
+#  ICOTOOL_VERSION_STRING: the version of icotool found.
+#
+
+#=============================================================================
+# Copyright 2012 Aleksey Avdeev <solo at altlinux.ru>
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+find_program(ICOTOOL_EXECUTABLE
+  icotool
+)
+
+if(ICOTOOL_EXECUTABLE)
+  execute_process(
+    COMMAND ${ICOTOOL_EXECUTABLE} --version
+    OUTPUT_VARIABLE _icotool_version
+    ERROR_QUIET
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+  if("${_icotool_version}" MATCHES "^icotool \\([^\\)]*\\) ([0-9\\.]+[^ \n]*).*")
+    set( ICOTOOL_VERSION_STRING
+      "${CMAKE_MATCH_1}"
+    )
+  else()
+    set( ICOTOOL_VERSION_STRING
+      ""
+    )
+  endif()
+  unset(_icotool_version)
+endif()
+
+# handle the QUIETLY and REQUIRED arguments and set ICOTOOL_FOUND to TRUE if
+# all listed variables are TRUE
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(
+  Icotool
+  REQUIRED_VARS ICOTOOL_EXECUTABLE
+  VERSION_VAR ICOTOOL_VERSION_STRING
+)
+
+mark_as_advanced(
+  ICOTOOL_EXECUTABLE
+)
diff --git a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
index 212c758..739593c 100644
--- a/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
+++ b/Tests/CMakeOnly/AllFindModules/CMakeLists.txt
@@ -70,8 +70,9 @@ endmacro()
 # If any of these modules reported that it was found a version number should have been
 # reported.
 
-foreach(VTEST ALSA ARMADILLO BZIP2 CUPS CURL EXPAT FREETYPE GETTEXT GIT HG HSPELL
-        JASPER LIBLZMA LIBXML2 LIBXSLT PERL PKG_CONFIG PostgreSQL TIFF ZLIB)
+foreach(VTEST ALSA ARMADILLO BZIP2 CUPS CURL EXPAT FREETYPE GETTEXT GIT HG
+        HSPELL ICOTOOL JASPER LIBLZMA LIBXML2 LIBXSLT PERL PKG_CONFIG
+        PostgreSQL TIFF ZLIB)
     check_version_string(${VTEST} ${VTEST}_VERSION_STRING)
 endforeach()
 

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

Summary of changes:
 Modules/FindIcotool.cmake                     |   56 +++++++++++++++++++++++++
 Source/CMakeVersion.cmake                     |    2 +-
 Tests/CMakeOnly/AllFindModules/CMakeLists.txt |    5 +-
 3 files changed, 60 insertions(+), 3 deletions(-)
 create mode 100644 Modules/FindIcotool.cmake


hooks/post-receive
-- 
CMake