[Cmake-commits] CMake branch, next, updated. v3.0.0-4637-g5902f23

Brad King brad.king at kitware.com
Wed Jul 30 10:17:37 EDT 2014


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  5902f23edabbf41b8bed31c2e9927d2c7c33c2ef (commit)
       via  d38b9f3e3e7708895ed8ddc2eea208eb5bc4dd34 (commit)
      from  00fafe4493dc3a2226e76fa502e93991440151b8 (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=5902f23edabbf41b8bed31c2e9927d2c7c33c2ef
commit 5902f23edabbf41b8bed31c2e9927d2c7c33c2ef
Merge: 00fafe4 d38b9f3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 30 10:17:36 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 30 10:17:36 2014 -0400

    Merge topic 'pdb-genex' into next
    
    d38b9f3e Tests/RunCMake: On Windows both MSVC and Intel support PDB


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

    Tests/RunCMake: On Windows both MSVC and Intel support PDB

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


More information about the Cmake-commits mailing list