[Cmake-commits] CMake branch, next, updated. v3.8.0-753-gfe6b9f2

[Kitware Robot]

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
  discards  8f8affaf540b03af63801dc3ee912266a57b406e (commit)
  discards  0287275d180920b64e6f521307bffe61a1cdf1d0 (commit)
       via  fe6b9f2972e114b79812a59a0d1235d4156fd7cc (commit)
       via  1b7603f4811a24fcc96dfabfced866508afd9d1c (commit)
       via  e155fba644d4686ac8b4f43dfe31c749bba30c67 (commit)
       via  9a5dcc32676a24a2dd282330839ce48d84c3da67 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (8f8affaf540b03af63801dc3ee912266a57b406e)
            \
             N -- N -- N (fe6b9f2972e114b79812a59a0d1235d4156fd7cc)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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=fe6b9f2972e114b79812a59a0d1235d4156fd7cc
commit fe6b9f2972e114b79812a59a0d1235d4156fd7cc
Merge: 1b7603f 9a5dcc3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 13 12:18:48 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Apr 13 08:18:51 2017 -0400

    Stage topic 'simpler-import-lib-check'
    
    Topic-id: 23650
    Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/699


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1b7603f4811a24fcc96dfabfced866508afd9d1c
commit 1b7603f4811a24fcc96dfabfced866508afd9d1c
Merge: e155fba fee0119
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 12 16:44:59 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Apr 13 08:15:33 2017 -0400

    Stage topic 'vs-custom-kits-dir'
    
    Topic-id: 23629
    Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/696


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9a5dcc32676a24a2dd282330839ce48d84c3da67
commit 9a5dcc32676a24a2dd282330839ce48d84c3da67
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Apr 13 08:12:55 2017 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Thu Apr 13 08:12:55 2017 -0400

    cmExportBuildFileGenerator: use HasImportLibrary

diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
index 0c25268..539d854 100644
--- a/Source/cmExportBuildFileGenerator.cxx
+++ b/Source/cmExportBuildFileGenerator.cxx
@@ -185,9 +185,7 @@ void cmExportBuildFileGenerator::SetImportLocationProperty(
   }
 
   // Add the import library for windows DLLs.
-  if (target->IsDLLPlatform() &&
-      (target->GetType() == cmStateEnums::SHARED_LIBRARY ||
-       target->IsExecutableWithExports()) &&
+  if (target->HasImportLibrary() &&
       mf->GetDefinition("CMAKE_IMPORT_LIBRARY_SUFFIX")) {
     std::string prop = "IMPORTED_IMPLIB";
     prop += suffix;

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

Summary of changes:
 Source/cmExportBuildFileGenerator.cxx |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)


hooks/post-receive
-- 
CMake