[Cmake-commits] CMake branch, next, updated. v2.8.7-2911-g4d2dcca

Rolf Eike Beer eike at sf-mail.de
Mon Feb 27 11:26:14 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  4d2dcca6998e1e38dc0aaa69223cad7c0ffcb8a5 (commit)
       via  518f965bbabf6678a3fc03948c38bc78e48cfdc3 (commit)
       via  00daeff02bd1507de46d3a0eac4743672ef1ecef (commit)
       via  08ff8727afba8363455af36de5dcc78cfb209158 (commit)
      from  aad5eb6d698bc644ee21048b55a118060ee2f072 (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=4d2dcca6998e1e38dc0aaa69223cad7c0ffcb8a5
commit 4d2dcca6998e1e38dc0aaa69223cad7c0ffcb8a5
Merge: aad5eb6 518f965
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Feb 27 11:26:09 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 27 11:26:09 2012 -0500

    Merge topic 'fix-findimagemagick-no-components' into next
    
    518f965 FindImageMagick: fix fail if no components were given
    00daeff KWSys Nightly Date Stamp
    08ff872 KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=518f965bbabf6678a3fc03948c38bc78e48cfdc3
commit 518f965bbabf6678a3fc03948c38bc78e48cfdc3
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Feb 27 17:25:24 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Feb 27 17:25:24 2012 +0100

    FindImageMagick: fix fail if no components were given
    
    The variable name should be added to the list here, not the content.

diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake
index 52d575b..0c890f5 100644
--- a/Modules/FindImageMagick.cmake
+++ b/Modules/FindImageMagick.cmake
@@ -171,7 +171,7 @@ FOREACH(component ${ImageMagick_FIND_COMPONENTS}
     ELSEIF(ImageMagick_${component}_EXECUTABLE)
       # if no components were requested explicitly put all (default) executables
       # in the list
-      LIST(APPEND ImageMagick_DEFAULT_EXECUTABLES "${ImageMagick_${component}_EXECUTABLE}")
+      LIST(APPEND ImageMagick_DEFAULT_EXECUTABLES ImageMagick_${component}_EXECUTABLE)
     ENDIF(ImageMagick_FIND_COMPONENTS)
   ENDIF(component STREQUAL "Magick++")
 ENDFOREACH(component)

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

Summary of changes:
 Modules/FindImageMagick.cmake     |    2 +-
 Source/kwsys/kwsysDateStamp.cmake |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list