[Cmake-commits] CMake branch, next, updated. v2.8.7-3378-g0a10b14

[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  0a10b14be71de2238341c594ea267c03e41c92a5 (commit)
       via  f93d03df435224594d21dc250b516e954e1dd86f (commit)
       via  7d99247454687cade1e7aff69fb411e1ec4f8f50 (commit)
       via  43fa86b60ff5196fc5b5fbc84649567b0eccf939 (commit)
      from  ac1dc84cfc767403a54ef3c5fcd194d33b877f49 (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=0a10b14be71de2238341c594ea267c03e41c92a5
commit 0a10b14be71de2238341c594ea267c03e41c92a5
Merge: ac1dc84 f93d03d
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Fri Mar 30 16:02:58 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Mar 30 16:02:58 2012 -0400

    Merge topic 'OBJECTLibrariesInEclipse' into next
    
    f93d03d fix #13054: support OBJECT libraries in Eclipse
    7d99247 KWSys Nightly Date Stamp
    43fa86b KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f93d03df435224594d21dc250b516e954e1dd86f
commit f93d03df435224594d21dc250b516e954e1dd86f
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Fri Mar 30 21:59:14 2012 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Fri Mar 30 21:59:14 2012 +0200

    fix #13054: support OBJECT libraries in Eclipse
    
    Alex

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index ebd7c7f..65077b3 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -501,6 +501,7 @@ void cmExtraEclipseCDT4Generator::CreateLinksForTargets(
         case cmTarget::STATIC_LIBRARY:
         case cmTarget::SHARED_LIBRARY:
         case cmTarget::MODULE_LIBRARY:
+        case cmTarget::OBJECT_LIBRARY:
           {
           const char* prefix = (ti->second.GetType()==cmTarget::EXECUTABLE ?
                                                           "[exe] " : "[lib] ");
@@ -1017,6 +1018,7 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
        case cmTarget::STATIC_LIBRARY:
        case cmTarget::SHARED_LIBRARY:
        case cmTarget::MODULE_LIBRARY:
+       case cmTarget::OBJECT_LIBRARY:
          {
          const char* prefix = (ti->second.GetType()==cmTarget::EXECUTABLE ?
                                                           "[exe] " : "[lib] ");

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

Summary of changes:
 Source/cmExtraEclipseCDT4Generator.cxx |    2 ++
 Source/kwsys/kwsysDateStamp.cmake      |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake