[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2845-g6528b09
Brad King
brad.king at kitware.com
Mon Jul 1 09:14:25 EDT 2013
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 6528b09a8462fd12e257c57928be7983321fc32b (commit)
via ae8e6543a506a5e3c16348af264c22a68c365087 (commit)
from 56ab0583fe6933c50b95d8684c94d867a6b7291e (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=6528b09a8462fd12e257c57928be7983321fc32b
commit 6528b09a8462fd12e257c57928be7983321fc32b
Merge: 56ab058 ae8e654
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 1 09:14:05 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 1 09:14:05 2013 -0400
Merge topic 'DontStripImportLibs' into next
ae8e654 install: do not strip dll import libraries (#14123)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ae8e6543a506a5e3c16348af264c22a68c365087
commit ae8e6543a506a5e3c16348af264c22a68c365087
Author: Alex Neundorf <neundorf at kde.org>
AuthorDate: Fri Jun 28 21:06:57 2013 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 1 08:56:03 2013 -0400
install: do not strip dll import libraries (#14123)
DLL import libraries exist specifically to have symbols.
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:
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list