[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1711-gd8017c3

[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  d8017c3c2ca2ccbba5e821d6e5968d60f529a7fc (commit)
       via  6808655e310fc287b0d21b240175bd505ce60901 (commit)
      from  d1b4aefb081b2885d7c2a48b0f1e393a8ea752e0 (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=d8017c3c2ca2ccbba5e821d6e5968d60f529a7fc
commit d8017c3c2ca2ccbba5e821d6e5968d60f529a7fc
Merge: d1b4aef 6808655
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 25 10:49:40 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 25 10:49:40 2014 -0500

    Merge topic 'msvc-compiler-pdb-files' into next
    
    6808655e Fix PDBDirectoryAndName test on Intel 11.1


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6808655e310fc287b0d21b240175bd505ce60901
commit 6808655e310fc287b0d21b240175bd505ce60901
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 25 10:47:17 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 25 10:47:21 2014 -0500

    Fix PDBDirectoryAndName test on Intel 11.1
    
    The Intel 11.1 compiler does not support the MSVC /Fd option so
    skip this part of the test on that version.

diff --git a/Tests/PDBDirectoryAndName/CMakeLists.txt b/Tests/PDBDirectoryAndName/CMakeLists.txt
index cd9546b..90af600 100644
--- a/Tests/PDBDirectoryAndName/CMakeLists.txt
+++ b/Tests/PDBDirectoryAndName/CMakeLists.txt
@@ -6,6 +6,13 @@ if(NOT MSVC AND NOT "${CMAKE_C_COMPILER_ID}" MATCHES "^(Intel)$")
   message(FATAL_ERROR "The PDBDirectoryAndName test works only with MSVC or Intel")
 endif()
 
+# Intel 11.1 does not support /Fd but Intel 14.0 does.
+# TODO: Did a version in between these add it?
+if(CMAKE_C_COMPILER_ID STREQUAL Intel AND
+   CMAKE_C_COMPILER_VERSION VERSION_LESS 14.0)
+  set(NO_COMPILE_PDB 1)
+endif()
+
 set(my_targets "")
 
 add_library(mylibA SHARED mylibA.c)
@@ -20,7 +27,9 @@ set_target_properties(mylibB PROPERTIES
     COMPILE_PDB_NAME "mylibB_Special"
     COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/mylibB_PDB"
 )
-list(APPEND my_targets mylibB)
+if(NOT NO_COMPILE_PDB)
+  list(APPEND my_targets mylibB)
+endif()
 
 add_library(mylibC SHARED mylibC.c)
 set_target_properties(mylibC PROPERTIES
@@ -32,7 +41,9 @@ add_library(mylibD STATIC mylibD.c)
 set_target_properties(mylibD PROPERTIES
     COMPILE_PDB_NAME "mylibD_Special"
 )
-list(APPEND my_targets mylibD)
+if(NOT NO_COMPILE_PDB)
+  list(APPEND my_targets mylibD)
+endif()
 
 add_executable(myexe myexe.c)
 set_target_properties(myexe PROPERTIES

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

Summary of changes:
 Tests/PDBDirectoryAndName/CMakeLists.txt |   15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake