[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2820-g754b1a4

[Alexander Neundorf]

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  754b1a473704e04055cb9601d61cc7eaf21cdb78 (commit)
       via  9b697145ef638aa4204a8887c821fc9c7b7d9698 (commit)
      from  34d0f30ae9d88db81bfa47173c2c1917501884e4 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=754b1a473704e04055cb9601d61cc7eaf21cdb78
commit 754b1a473704e04055cb9601d61cc7eaf21cdb78
Merge: 34d0f30 9b69714
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Fri Jun 28 15:08:08 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 28 15:08:08 2013 -0400

    Merge topic 'DontStripImportLibs' into next
    
    9b69714 fix #14123: don't strip import libraries when installing


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9b697145ef638aa4204a8887c821fc9c7b7d9698
commit 9b697145ef638aa4204a8887c821fc9c7b7d9698
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Fri Jun 28 21:06:57 2013 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Fri Jun 28 21:06:57 2013 +0200

    fix #14123: don't strip import libraries when installing
    
    The patch was attached to
    http://public.kitware.com/Bug/view.php?id=14123
    
    Alex

diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index ed01210..c9624c8 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -717,9 +717,9 @@ cmInstallTargetGenerator::AddStripRule(std::ostream& os,
                                        const std::string& toDestDirPath)
 {
 
-  // don't strip static libraries, because it removes the only symbol table
-  // they have so you can't link to them anymore
-  if(this->Target->GetType() == cmTarget::STATIC_LIBRARY)
+  // don't strip static and import libraries, because it removes the only
+  // symbol table they have so you can't link to them anymore
+  if(this->Target->GetType()==cmTarget::STATIC_LIBRARY || this->ImportLibrary)
     {
     return;
     }

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

Summary of changes:
 Source/cmInstallTargetGenerator.cxx |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake