[Cmake-commits] CMake branch, next, updated. v2.8.9-861-g4a3a376

[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  4a3a376fcdc12347b01566302bce3594b7ca2090 (commit)
       via  2ccca05fade0014dbfbce906b20ab4073ecd8d9c (commit)
      from  a5682374ac3605c34ba595ac9932d6426f699c63 (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=4a3a376fcdc12347b01566302bce3594b7ca2090
commit 4a3a376fcdc12347b01566302bce3594b7ca2090
Merge: a568237 2ccca05
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Sep 29 07:19:43 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Sep 29 07:19:43 2012 -0400

    Merge topic 'vs-pdb-output' into next
    
    2ccca05 Run PDBDirectoryAndName test on MSVC and Intel


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2ccca05fade0014dbfbce906b20ab4073ecd8d9c
commit 2ccca05fade0014dbfbce906b20ab4073ecd8d9c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Sep 29 06:36:46 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sat Sep 29 07:17:42 2012 -0400

    Run PDBDirectoryAndName test on MSVC and Intel
    
    Move it out of the condition that also accepts MinGW/MSYS.
    Teach the test to allow the Intel for Windows compiler but
    do not verify the results because the compiler does not
    seem to write PDB output in all cases.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 4d071cb..ae69ce8 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1254,12 +1254,12 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
 
   if(CMAKE_TEST_MSVC)
     ADD_TEST_MACRO(ForceInclude foo)
+    ADD_TEST_MACRO(PDBDirectoryAndName myexe)
     ADD_TEST_MACRO(PrecompiledHeader foo)
   endif()
   if(CMAKE_TEST_MSVC OR
       "${CMAKE_TEST_GENERATOR}" MATCHES "(MSYS|MinGW) Makefiles")
     ADD_TEST_MACRO(ModuleDefinition example_exe)
-    ADD_TEST_MACRO(PDBDirectoryAndName myexe)
   endif()
 
   ADD_TEST_MACRO(CheckCompilerRelatedVariables CheckCompilerRelatedVariables)
diff --git a/Tests/PDBDirectoryAndName/CMakeLists.txt b/Tests/PDBDirectoryAndName/CMakeLists.txt
index 865d278..bc2f013 100644
--- a/Tests/PDBDirectoryAndName/CMakeLists.txt
+++ b/Tests/PDBDirectoryAndName/CMakeLists.txt
@@ -1,8 +1,9 @@
 cmake_minimum_required(VERSION 2.8)
 project(PDBDirectoryAndName C)
 
-if(NOT MSVC)
-    MESSAGE(FATAL_ERROR "The PDB file test works only with MSVC")
+# Make sure the proper compiler is in use.
+if(NOT MSVC AND NOT "${CMAKE_C_COMPILER_ID}" MATCHES "^(Intel)$")
+  message(FATAL_ERROR "The PDBDirectoryAndName test works only with MSVC or Intel")
 endif()
 
 set(my_targets "")
@@ -57,6 +58,10 @@ target_link_libraries(myexe2 mylibA mylibD)
 if("${CMAKE_GENERATOR}" MATCHES "Visual Studio 6")
   return()
 endif()
+# PDB output not fully implemented for Intel
+if("${CMAKE_C_COMPILER_ID}" MATCHES "^(Intel)$")
+  return()
+endif()
 
 set(pdbs "")
 foreach(t ${my_targets})

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

Summary of changes:
 Tests/CMakeLists.txt                     |    2 +-
 Tests/PDBDirectoryAndName/CMakeLists.txt |    9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake