[Cmake-commits] CMake branch, next, updated. v3.0.0-rc2-1161-ge8beecb

[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  e8beecbfa29e7b982a002d32fc2ae4848c5c67a1 (commit)
       via  7d3a5252d3a1f5c5257061acef5cbad822c9a93d (commit)
      from  0375d65a0df7c5749fa58d4ff15682a7aa30eeb4 (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=e8beecbfa29e7b982a002d32fc2ae4848c5c67a1
commit e8beecbfa29e7b982a002d32fc2ae4848c5c67a1
Merge: 0375d65 7d3a525
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Mar 18 16:44:37 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 18 16:44:37 2014 -0400

    Merge topic 'target-sources-refactor' into next
    
    7d3a5252 Fix test with xcode.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7d3a5252d3a1f5c5257061acef5cbad822c9a93d
commit 7d3a5252d3a1f5c5257061acef5cbad822c9a93d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Mar 18 21:31:48 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Mar 18 21:43:13 2014 +0100

    Fix test with xcode.

diff --git a/Tests/GeneratorExpression/check_object_files.cmake b/Tests/GeneratorExpression/check_object_files.cmake
index f8fcf42..f39ea71 100644
--- a/Tests/GeneratorExpression/check_object_files.cmake
+++ b/Tests/GeneratorExpression/check_object_files.cmake
@@ -17,12 +17,24 @@ foreach(objlib_file ${objlib_files})
   endif()
 
   if (NOT file_exists)
-    foreach(config_macro "$(Configuration)" "$(OutDir)" "$(IntDir)")
-      string(REPLACE "${config_macro}" "${TEST_CONFIGURATION}" config_file "${objlib_file}")
-      if (EXISTS ${config_file})
-        set(file_exists True)
+    if (objlib_file MATCHES ".(CURRENT_ARCH)")
+      string(REPLACE "$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)" "*" config_file "${objlib_file}")
+      string(REPLACE "$(PROJECT_NAME)" "GeneratorExpression" config_file "${config_file}")
+      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}")
       endif()
-    endforeach()
+      set(file_exists True)
+    else()
+      foreach(config_macro "$(Configuration)" "$(OutDir)" "$(IntDir)")
+        string(REPLACE "${config_macro}" "${TEST_CONFIGURATION}" config_file "${config_file}")
+        if (EXISTS ${config_file})
+          set(file_exists True)
+        endif()
+      endforeach()
+    endif()
   endif()
 
   if (NOT file_exists)

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

Summary of changes:
 Tests/GeneratorExpression/check_object_files.cmake |   22 +++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake