[Cmake-commits] CMake branch, next, updated. v2.8.7-3381-gdb23207

[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  db232079fc54545a73f82c82c91e64bf3df87efd (commit)
       via  d2ed3c7dee72a41339ff95fb7aefac60778234df (commit)
       via  41d1a73e5b142349d9b61e371f36a89f7ae73ac7 (commit)
      from  0a10b14be71de2238341c594ea267c03e41c92a5 (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=db232079fc54545a73f82c82c91e64bf3df87efd
commit db232079fc54545a73f82c82c91e64bf3df87efd
Merge: 0a10b14 d2ed3c7
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Sat Mar 31 10:04:02 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Mar 31 10:04:02 2012 -0400

    Merge topic 'OBJECTLibrariesInCodeBlocks' into next
    
    d2ed3c7 -fix #13081: support OBJECT libraries in CodeBlocks/QtCreator projects
    41d1a73 KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d2ed3c7dee72a41339ff95fb7aefac60778234df
commit d2ed3c7dee72a41339ff95fb7aefac60778234df
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Sat Mar 31 16:01:37 2012 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Sat Mar 31 16:01:37 2012 +0200

    -fix #13081: support OBJECT libraries in CodeBlocks/QtCreator projects
    
    Alex

diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index ccb17f0..e0574ea 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -383,6 +383,7 @@ void cmExtraCodeBlocksGenerator
         case cmTarget::STATIC_LIBRARY:
         case cmTarget::SHARED_LIBRARY:
         case cmTarget::MODULE_LIBRARY:
+        case cmTarget::OBJECT_LIBRARY:
           {
           this->AppendTarget(fout, ti->first.c_str(), &ti->second,
                              make.c_str(), makefile, compiler.c_str());
@@ -420,6 +421,7 @@ void cmExtraCodeBlocksGenerator
         case cmTarget::STATIC_LIBRARY:
         case cmTarget::SHARED_LIBRARY:
         case cmTarget::MODULE_LIBRARY:
+        case cmTarget::OBJECT_LIBRARY:
         case cmTarget::UTILITY: // can have sources since 2.6.3
           {
           const std::vector<cmSourceFile*>&sources=ti->second.GetSourceFiles();
@@ -570,7 +572,17 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
       }
 
     const char* buildType = makefile->GetDefinition("CMAKE_BUILD_TYPE");
-    fout<<"         <Option output=\"" << target->GetLocation(buildType)
+    const char* location = 0;
+    if ( target->GetType()==cmTarget::OBJECT_LIBRARY)
+      {
+      location = "dummy"; // hmm, what to use here ?
+      }
+    else
+      {
+      location = target->GetLocation(buildType);
+      }
+
+    fout<<"         <Option output=\"" << location
                             << "\" prefix_auto=\"0\" extension_auto=\"0\" />\n"
           "         <Option working_dir=\"" << workingDir << "\" />\n"
           "         <Option object_output=\"./\" />\n"
@@ -728,7 +740,8 @@ int cmExtraCodeBlocksGenerator::GetCBTargetType(cmTarget* target)
       return 1;
       }
     }
-  else if ( target->GetType()==cmTarget::STATIC_LIBRARY)
+  else if (( target->GetType()==cmTarget::STATIC_LIBRARY)
+        || (target->GetType()==cmTarget::OBJECT_LIBRARY))
     {
     return 2;
     }

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

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


hooks/post-receive
-- 
CMake