diff options
| author | Brad King <brad.king@kitware.com> | 2012-09-29 10:36:46 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-09-29 11:17:42 (GMT) |
| commit | 2ccca05fade0014dbfbce906b20ab4073ecd8d9c (patch) | |
| tree | b775cae8af5cd59e37710152ac719f90e8bd19a7 | |
| parent | efc83b369b26624e7f0fb90d9125ef5ec6d1f7fa (diff) | |
| download | CMake-2ccca05fade0014dbfbce906b20ab4073ecd8d9c.zip CMake-2ccca05fade0014dbfbce906b20ab4073ecd8d9c.tar.gz CMake-2ccca05fade0014dbfbce906b20ab4073ecd8d9c.tar.bz2 | |
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.
| -rw-r--r-- | Tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/PDBDirectoryAndName/CMakeLists.txt | 9 |
2 files changed, 8 insertions, 3 deletions
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}) |