[Cmake-commits] CMake branch, next, updated. v3.0.0-4659-g65800e9

[Brad King]

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  65800e99476e54d6cec2151f6873a56676821698 (commit)
       via  b0431b961a41ad0af05ab5afd911967ad23bfcae (commit)
      from  801dfae43d0f419a0d4015e34ebd1b52710f9c35 (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=65800e99476e54d6cec2151f6873a56676821698
commit 65800e99476e54d6cec2151f6873a56676821698
Merge: 801dfae b0431b9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 30 16:12:02 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 30 16:12:02 2014 -0400

    Merge topic 'pdb-genex' into next
    
    b0431b96 Tests/RunCMake: Fix condition precedence


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b0431b961a41ad0af05ab5afd911967ad23bfcae
commit b0431b961a41ad0af05ab5afd911967ad23bfcae
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 30 16:12:52 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 30 16:12:52 2014 -0400

    Tests/RunCMake: Fix condition precedence

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index b6e392b..3cd9947 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -23,7 +23,7 @@ endif()
 
 # Test MSVC for older host CMake versions, and test
 # WIN32/CMAKE_C_COMPILER_ID to fix check on Intel for Windows.
-if(MSVC OR WIN32 AND CMAKE_C_COMPILER_ID MATCHES "MSVC|Intel")
+if(MSVC OR (WIN32 AND CMAKE_C_COMPILER_ID MATCHES "MSVC|Intel"))
   set(GeneratorExpression_ARGS -DLINKER_SUPPORTS_PDB=1)
 endif()
 

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

Summary of changes:
 Tests/RunCMake/CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake