[Cmake-commits] CMake branch, next, updated. v2.8.10.1-816-g7bc3a98

[Alexander Neundorf]

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  7bc3a986424a2a5eb905ff14709871c8084796f7 (commit)
       via  b58fd6569a57213299762a9ca04569650e9b7ffa (commit)
      from  b8dfd1bea3b59840bd39c247d6628bd305ae9288 (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=7bc3a986424a2a5eb905ff14709871c8084796f7
commit 7bc3a986424a2a5eb905ff14709871c8084796f7
Merge: b8dfd1b b58fd65
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Wed Nov 7 11:50:16 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 7 11:50:16 2012 -0500

    Merge topic 'MakeSquish4Work' into next
    
    b58fd65 Squish: fix new squish_v4_add_test() macro


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b58fd6569a57213299762a9ca04569650e9b7ffa
commit b58fd6569a57213299762a9ca04569650e9b7ffa
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Wed Nov 7 17:48:53 2012 +0100
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Wed Nov 7 17:48:53 2012 +0100

    Squish: fix new squish_v4_add_test() macro
    
    The OUTPUT_NAME target property only returns something if it has been
    explicitely set. So use LOCATION, and extract the filename from that.
    
    Alex

diff --git a/Modules/FindSquish.cmake b/Modules/FindSquish.cmake
index ad72958..b797805 100644
--- a/Modules/FindSquish.cmake
+++ b/Modules/FindSquish.cmake
@@ -221,7 +221,7 @@ function(SQUISH_V4_ADD_TEST testName)
 
   get_target_property(testAUTLocation ${_SQUISH_AUT} LOCATION)
   get_filename_component(testAUTDir ${testAUTLocation} PATH)
-  get_target_property(testAUTName ${_SQUISH_AUT} OUTPUT_NAME)
+  get_filename_component(testAUTName ${testAUTLocation} NAME)
 
   get_filename_component(absTestSuite "${_SQUISH_SUITE}" ABSOLUTE)
   if(NOT EXISTS "${absTestSuite}")

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

Summary of changes:
 Modules/FindSquish.cmake |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake