diff options
| author | Brad King <brad.king@kitware.com> | 2017-02-24 16:31:46 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-02-24 16:31:46 (GMT) |
| commit | ad3bf56dd210888c94fac33238b35ddccf3a8053 (patch) | |
| tree | 8a5c48fe28f21cfca9b19ba0c6c5ca97742391e5 | |
| parent | 8ea060f960c1aa9d2fd2da6a035f03a64d08863b (diff) | |
| parent | feff52d42ca18a52fd99e8fdfd3093c3a94eb498 (diff) | |
| download | CMake-ad3bf56dd210888c94fac33238b35ddccf3a8053.zip CMake-ad3bf56dd210888c94fac33238b35ddccf3a8053.tar.gz CMake-ad3bf56dd210888c94fac33238b35ddccf3a8053.tar.bz2 | |
Merge branch 'object-library-compile-pdb' into release
| -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) |