diff options
| author | Brad King <brad.king@kitware.com> | 2017-02-24 16:19:24 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-02-24 16:26:52 (GMT) |
| commit | feff52d42ca18a52fd99e8fdfd3093c3a94eb498 (patch) | |
| tree | 8c7eb9ac81a2af590efcc63de5a5aecbfdb9bbdb | |
| parent | 6cbad490c2fdbd9bdc67b406b9f2dcdc21e08ddb (diff) | |
| download | CMake-feff52d42ca18a52fd99e8fdfd3093c3a94eb498.zip CMake-feff52d42ca18a52fd99e8fdfd3093c3a94eb498.tar.gz CMake-feff52d42ca18a52fd99e8fdfd3093c3a94eb498.tar.bz2 | |
Fix COMPILE_PDB_NAME when used on an OBJECT library
When `COMPILE_PDB_NAME` is used without `COMPILE_PDB_OUTPUT_DIRECTORY`
we cannot fall back on the link `PDB_OUTPUT_DIRECTORY` for an object
library because it has no link step.
Fixes: #16674
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 2 | ||||
| -rw-r--r-- | Tests/ObjectLibrary/A/CMakeLists.txt | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 6ce8140..3fe5c83 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -1147,7 +1147,7 @@ std::string cmGeneratorTarget::GetCompilePDBPath( { std::string dir = this->GetCompilePDBDirectory(config); std::string name = this->GetCompilePDBName(config); - if (dir.empty() && !name.empty()) { + if (dir.empty() && !name.empty() && this->HaveWellDefinedOutputFiles()) { dir = this->GetPDBDirectory(config); } if (!dir.empty()) { diff --git a/Tests/ObjectLibrary/A/CMakeLists.txt b/Tests/ObjectLibrary/A/CMakeLists.txt index 188fd64..c185d75 100644 --- a/Tests/ObjectLibrary/A/CMakeLists.txt +++ b/Tests/ObjectLibrary/A/CMakeLists.txt @@ -21,3 +21,4 @@ add_custom_command( add_library(A OBJECT a1.c a2.c a.cmake) target_include_directories(A PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) +set_property(TARGET A PROPERTY COMPILE_PDB_NAME Apdb) |