[Cmake-commits] CMake branch, next, updated. v3.0.0-rc2-1177-ge9bd134

[Stephen Kelly]

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  e9bd1349cfe464e1d009307b69a38e4b595de8df (commit)
       via  bb17c158577491729e25842ff76c55455d58e20a (commit)
      from  728ef0e9a1d69479ee3ab169cb46ae7783ea142b (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=e9bd1349cfe464e1d009307b69a38e4b595de8df
commit e9bd1349cfe464e1d009307b69a38e4b595de8df
Merge: 728ef0e bb17c15
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Mar 18 18:54:38 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 18 18:54:38 2014 -0400

    Merge topic 'target-sources-refactor' into next
    
    bb17c158 Get more information from this test on failure.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bb17c158577491729e25842ff76c55455d58e20a
commit bb17c158577491729e25842ff76c55455d58e20a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Mar 18 23:54:09 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Mar 18 23:54:09 2014 +0100

    Get more information from this test on failure.

diff --git a/Tests/GeneratorExpression/check_object_files.cmake b/Tests/GeneratorExpression/check_object_files.cmake
index f39ea71..fc8c972 100644
--- a/Tests/GeneratorExpression/check_object_files.cmake
+++ b/Tests/GeneratorExpression/check_object_files.cmake
@@ -23,13 +23,14 @@ foreach(objlib_file ${objlib_files})
       string(REPLACE "$(CURRENT_ARCH)" "*" config_file "${config_file}")
       file(GLOB_RECURSE files "${config_file}")
       list(LENGTH files num_files)
-      if (NOT num_files EQUAL 1)
-        message(SEND_ERROR "Got wrong number of files for expression ${config_file}")
+      if (NOT files)
+        message(SEND_ERROR "Got no files for expression ${config_file}")
       endif()
       set(file_exists True)
     else()
       foreach(config_macro "$(Configuration)" "$(OutDir)" "$(IntDir)")
         string(REPLACE "${config_macro}" "${TEST_CONFIGURATION}" config_file "${config_file}")
+        list(APPEND attempts ${config_file})
         if (EXISTS ${config_file})
           set(file_exists True)
         endif()
@@ -38,6 +39,10 @@ foreach(objlib_file ${objlib_files})
   endif()
 
   if (NOT file_exists)
-    message(SEND_ERROR "File \"${objlib_file}\" does not exist!")
+    if(attempts)
+      list(REMOVE_DUPLICATES attempts)
+      set(tried "  Tried ${attempts}")
+    endif()
+    message(SEND_ERROR "File \"${objlib_file}\" does not exist!${tried}")
   endif()
 endforeach()

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

Summary of changes:
 Tests/GeneratorExpression/check_object_files.cmake |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake