diff options
| author | Brad King <brad.king@kitware.com> | 2013-05-16 18:36:11 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-05-16 18:36:11 (GMT) |
| commit | 1b4b64cd3c2f22260c74537cfaf84dc52d6cf86c (patch) | |
| tree | 293c7f51d9bcf64e0d3ae4cf3632e3497de4e9d5 /Tests | |
| parent | 7e7b7fe4b320fedb838485a6bfcfb582cccf0fcc (diff) | |
| parent | 87c0d16ab7e4128d81411db35ef05d4428b8c236 (diff) | |
| download | CMake-1b4b64cd3c2f22260c74537cfaf84dc52d6cf86c.zip CMake-1b4b64cd3c2f22260c74537cfaf84dc52d6cf86c.tar.gz CMake-1b4b64cd3c2f22260c74537cfaf84dc52d6cf86c.tar.bz2 | |
Merge topic 'vs-no-compiler-pdb-setting'
87c0d16 Ninja: Fix OBJECT_DIR placeholder path conversion
fb9f73d MSVC: Invoke 'link' directly for executables
42ba1b0 VS: Separate compiler and linker PDB files (#11899, #14062)
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/PDBDirectoryAndName/CMakeLists.txt | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Tests/PDBDirectoryAndName/CMakeLists.txt b/Tests/PDBDirectoryAndName/CMakeLists.txt index bc2f013..28e46b1 100644 --- a/Tests/PDBDirectoryAndName/CMakeLists.txt +++ b/Tests/PDBDirectoryAndName/CMakeLists.txt @@ -20,7 +20,9 @@ set_target_properties(mylibB PROPERTIES PDB_NAME "mylibB_Special" PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/mylibB_PDB" ) -list(APPEND my_targets mylibB) +# TODO: The only .pdb available for a static library is that generated +# by the compiler /Fd option which is not the same as the linker /pdb. +# list(APPEND my_targets mylibB) add_library(mylibC SHARED mylibC.c) set_target_properties(mylibC PROPERTIES @@ -32,7 +34,8 @@ add_library(mylibD STATIC mylibD.c) set_target_properties(mylibD PROPERTIES PDB_NAME "mylibD_Special" ) -list(APPEND my_targets mylibD) +# TODO: See comment for mylibB. +# list(APPEND my_targets mylibD) add_executable(myexe myexe.c) set_target_properties(myexe PROPERTIES @@ -58,10 +61,6 @@ 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}) |