[Cmake-commits] CMake branch, next, updated. v3.0.0-4569-g767c8c3

[Nils Gladitz]

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  767c8c39ef2a37ab0c3cbe4c50a429abd1613886 (commit)
       via  8402e1d79ee41ef65101636c23abac14a8ea42e2 (commit)
      from  b2c6c531909aa6c58c5a89bf99f0e0767cb39208 (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=767c8c39ef2a37ab0c3cbe4c50a429abd1613886
commit 767c8c39ef2a37ab0c3cbe4c50a429abd1613886
Merge: b2c6c53 8402e1d
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Mon Jul 28 18:09:59 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 28 18:09:59 2014 -0400

    Merge topic 'pdb-genex' into next
    
    8402e1d7 Genex: Use first available config in multi-config generators


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8402e1d79ee41ef65101636c23abac14a8ea42e2
commit 8402e1d79ee41ef65101636c23abac14a8ea42e2
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Jul 29 00:09:45 2014 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Tue Jul 29 00:09:45 2014 +0200

    Genex: Use first available config in multi-config generators

diff --git a/Tests/RunCMake/GeneratorExpression/ValidTarget-TARGET_PDB_FILE.cmake b/Tests/RunCMake/GeneratorExpression/ValidTarget-TARGET_PDB_FILE.cmake
index e8c5184..2cd6db3 100644
--- a/Tests/RunCMake/GeneratorExpression/ValidTarget-TARGET_PDB_FILE.cmake
+++ b/Tests/RunCMake/GeneratorExpression/ValidTarget-TARGET_PDB_FILE.cmake
@@ -3,6 +3,11 @@ enable_language(C)
 
 add_library(empty SHARED empty.c)
 
+if(CMAKE_CONFIGURATION_TYPES)
+  list(GET CMAKE_CONFIGURATION_TYPES 0 FIRST_CONFIG)
+  set(GENERATE_CONDITION CONDITION ${FIRST_CONFIG})
+endif()
+
 file(GENERATE
   OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/test.txt"
   CONTENT
@@ -10,4 +15,5 @@ file(GENERATE
 $<TARGET_PDB_FILE_NAME:empty>
 $<TARGET_PDB_FILE_DIR:empty>
 ]]
+  ${GENERATE_CONDITION}
 )

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

Summary of changes:
 .../GeneratorExpression/ValidTarget-TARGET_PDB_FILE.cmake        |    6 ++++++
 1 file changed, 6 insertions(+)


hooks/post-receive
-- 
CMake