[Cmake-commits] CMake branch, next, updated. v2.8.9-737-g2d35bdc

[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  2d35bdc1373a67ead6ded0110a6b0984daf0d5bd (commit)
       via  fd5a92f744c2e36a9f442dd45f3a6f051b543ca8 (commit)
       via  403bb6c18034176a23472604426933a6880892ec (commit)
      from  8a5434bf3d46377984c7eb416c6ae473b8028cb7 (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=2d35bdc1373a67ead6ded0110a6b0984daf0d5bd
commit 2d35bdc1373a67ead6ded0110a6b0984daf0d5bd
Merge: 8a5434b fd5a92f
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Tue Sep 25 13:20:58 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 25 13:20:58 2012 -0400

    Merge topic 'export-sets-2' into next
    
    fd5a92f fix build with MSVC6: it seems it doesn't like deleting const pointers
    403bb6c fix warning about missing newline at end of file


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fd5a92f744c2e36a9f442dd45f3a6f051b543ca8
commit fd5a92f744c2e36a9f442dd45f3a6f051b543ca8
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Tue Sep 25 19:19:27 2012 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Tue Sep 25 19:19:27 2012 +0200

    fix build with MSVC6: it seems it doesn't like deleting const pointers
    
    Alex

diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 06ef2f3..fd93791 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -286,7 +286,7 @@ std::vector<std::string> cmExportFileGenerator::FindNamespaces(cmMakefile* mf,
       ++expIt)
     {
     const cmExportSet* exportSet = expIt->second;
-    std::vector<cmTargetExport const*> const* targets =
+    std::vector<cmTargetExport*> const* targets =
                                                  exportSet->GetTargetExports();
 
     bool containsTarget = false;
diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
index 94b9f46..cd05e60 100644
--- a/Source/cmExportInstallFileGenerator.cxx
+++ b/Source/cmExportInstallFileGenerator.cxx
@@ -37,7 +37,7 @@ std::string cmExportInstallFileGenerator::GetConfigImportFileGlob()
 bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
 {
   // Create all the imported targets.
-  for(std::vector<cmTargetExport const*>::const_iterator
+  for(std::vector<cmTargetExport*>::const_iterator
         tei = this->IEGen->GetExportSet()->GetTargetExports()->begin();
       tei != this->IEGen->GetExportSet()->GetTargetExports()->end(); ++tei)
     {
@@ -163,7 +163,7 @@ cmExportInstallFileGenerator
     }
 
   // Add each target in the set to the export.
-  for(std::vector<cmTargetExport const*>::const_iterator
+  for(std::vector<cmTargetExport*>::const_iterator
         tei = this->IEGen->GetExportSet()->GetTargetExports()->begin();
       tei != this->IEGen->GetExportSet()->GetTargetExports()->end(); ++tei)
     {
diff --git a/Source/cmExportSet.cxx b/Source/cmExportSet.cxx
index 464ad68..33b0630 100644
--- a/Source/cmExportSet.cxx
+++ b/Source/cmExportSet.cxx
@@ -21,7 +21,7 @@ cmExportSet::~cmExportSet()
     }
 }
 
-void cmExportSet::AddTargetExport(cmTargetExport const* te)
+void cmExportSet::AddTargetExport(cmTargetExport* te)
 {
   this->TargetExports.push_back(te);
 }
diff --git a/Source/cmExportSet.h b/Source/cmExportSet.h
index 91a8bf9..a57aa12 100644
--- a/Source/cmExportSet.h
+++ b/Source/cmExportSet.h
@@ -25,20 +25,20 @@ public:
   /// Destructor
   ~cmExportSet();
 
-  void AddTargetExport(cmTargetExport const* tgt);
+  void AddTargetExport(cmTargetExport* tgt);
 
   void AddInstallation(cmInstallExportGenerator const* installation);
 
   std::string const& GetName() const { return this->Name; }
 
-  std::vector<cmTargetExport const*> const* GetTargetExports() const
+  std::vector<cmTargetExport*> const* GetTargetExports() const
      { return &this->TargetExports; }
 
   std::vector<cmInstallExportGenerator const*> const* GetInstallations() const
      { return &this->Installations; }
 
 private:
-  std::vector<cmTargetExport const*> TargetExports;
+  std::vector<cmTargetExport*> TargetExports;
   std::string Name;
   std::vector<cmInstallExportGenerator const*> Installations;
 };

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=403bb6c18034176a23472604426933a6880892ec
commit 403bb6c18034176a23472604426933a6880892ec
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Tue Sep 25 19:15:27 2012 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Tue Sep 25 19:15:27 2012 +0200

    fix warning about missing newline at end of file
    
    Alex

diff --git a/Source/cmExportSetMap.h b/Source/cmExportSetMap.h
index 043639d..4663c55 100644
--- a/Source/cmExportSetMap.h
+++ b/Source/cmExportSetMap.h
@@ -30,4 +30,4 @@ public:
   ~cmExportSetMap();
 };
 
-#endif
\ No newline at end of file
+#endif

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

Summary of changes:
 Source/cmExportFileGenerator.cxx        |    2 +-
 Source/cmExportInstallFileGenerator.cxx |    4 ++--
 Source/cmExportSet.cxx                  |    2 +-
 Source/cmExportSet.h                    |    6 +++---
 Source/cmExportSetMap.h                 |    2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake