[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-554-g434c112

[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  434c1123eb011a242e60279691df906e4a5244a7 (commit)
       via  feff52d42ca18a52fd99e8fdfd3093c3a94eb498 (commit)
      from  0da16ecd007f3a444aefa6f70fe075ed09dbb795 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=434c1123eb011a242e60279691df906e4a5244a7
commit 434c1123eb011a242e60279691df906e4a5244a7
Merge: 0da16ec feff52d4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 24 11:33:44 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 24 11:33:44 2017 -0500

    Merge topic 'object-library-compile-pdb' into next
    
    feff52d4 Fix COMPILE_PDB_NAME when used on an OBJECT library


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=feff52d42ca18a52fd99e8fdfd3093c3a94eb498
commit feff52d42ca18a52fd99e8fdfd3093c3a94eb498
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 24 11:19:24 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 24 11:26:52 2017 -0500

    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

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)

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

Summary of changes:
 Source/cmGeneratorTarget.cxx         |    2 +-
 Tests/ObjectLibrary/A/CMakeLists.txt |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake