[Cmake-commits] CMake branch, next, updated. v3.0.0-4651-g51cedfa

[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  51cedfa05f875d31ba4abd362ea1c00e68e09e54 (commit)
       via  693c4471e0728f246e96524b844d4c018674f91f (commit)
      from  8d02eebed87f7fab1d1c10aa180a76e995cee028 (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=51cedfa05f875d31ba4abd362ea1c00e68e09e54
commit 51cedfa05f875d31ba4abd362ea1c00e68e09e54
Merge: 8d02eeb 693c447
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 30 14:32:46 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 30 14:32:46 2014 -0400

    Merge topic 'pdb-genex' into next
    
    693c4471 Tests/RunCMake: No VS CMAKE_C_COMPILER_ID in older CMake versions


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=693c4471e0728f246e96524b844d4c018674f91f
commit 693c4471e0728f246e96524b844d4c018674f91f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 30 14:32:32 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 30 14:33:57 2014 -0400

    Tests/RunCMake: No VS CMAKE_C_COMPILER_ID in older CMake versions

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 772378e..b6e392b 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -21,7 +21,9 @@ if(XCODE_VERSION AND "${XCODE_VERSION}" VERSION_LESS 2)
   set(File_Generate_ARGS -DXCODE_BELOW_2=1)
 endif()
 
-if(WIN32 AND CMAKE_C_COMPILER_ID MATCHES "MSVC|Intel")
+# 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")
   set(GeneratorExpression_ARGS -DLINKER_SUPPORTS_PDB=1)
 endif()
 

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

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


hooks/post-receive
-- 
CMake