[Cmake-commits] CMake branch, next, updated. v3.0.0-4575-g9b62856

[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  9b6285615ccbb54be13a758962cfd75fcf007a09 (commit)
       via  522c19ab395f4286f835fde798c184e7d92e5d9c (commit)
      from  0abadbb4b10518a5ee8ef718cd1db3c9e43dc44c (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=9b6285615ccbb54be13a758962cfd75fcf007a09
commit 9b6285615ccbb54be13a758962cfd75fcf007a09
Merge: 0abadbb 522c19a
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Jul 29 04:38:27 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 29 04:38:27 2014 -0400

    Merge topic 'pdb-genex' into next
    
    522c19ab Genex: file(GENERATE) CONDITION has to evaluate to 1 or 0


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=522c19ab395f4286f835fde798c184e7d92e5d9c
commit 522c19ab395f4286f835fde798c184e7d92e5d9c
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Jul 29 10:38:01 2014 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Tue Jul 29 10:38:01 2014 +0200

    Genex: file(GENERATE) CONDITION has to evaluate to 1 or 0

diff --git a/Tests/RunCMake/GeneratorExpression/ValidTarget-TARGET_PDB_FILE.cmake b/Tests/RunCMake/GeneratorExpression/ValidTarget-TARGET_PDB_FILE.cmake
index 2cd6db3..38e47f9 100644
--- a/Tests/RunCMake/GeneratorExpression/ValidTarget-TARGET_PDB_FILE.cmake
+++ b/Tests/RunCMake/GeneratorExpression/ValidTarget-TARGET_PDB_FILE.cmake
@@ -5,7 +5,7 @@ add_library(empty SHARED empty.c)
 
 if(CMAKE_CONFIGURATION_TYPES)
   list(GET CMAKE_CONFIGURATION_TYPES 0 FIRST_CONFIG)
-  set(GENERATE_CONDITION CONDITION ${FIRST_CONFIG})
+  set(GENERATE_CONDITION CONDITION $<CONFIG:${FIRST_CONFIG}>)
 endif()
 
 file(GENERATE

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

Summary of changes:
 Tests/RunCMake/GeneratorExpression/ValidTarget-TARGET_PDB_FILE.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake