[Cmake-commits] CMake branch, next, updated. v2.8.4-1503-g07dd1ba

[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  07dd1ba82769c1437b970624a80afca1f6516929 (commit)
       via  a7d8d49b8fc829e76686cbc4cc808db4a8542994 (commit)
       via  303c7e8f4087c9096e7544c327f83557582821f3 (commit)
       via  19e3397942e176cfc44aa925396725d99bc49db4 (commit)
      from  a12c6cda99d5c242173d506b957c57a03cd78db2 (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=07dd1ba82769c1437b970624a80afca1f6516929
commit 07dd1ba82769c1437b970624a80afca1f6516929
Merge: a12c6cd a7d8d49
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Fri May 6 16:48:53 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri May 6 16:48:53 2011 -0400

    Merge topic 'FixVirtualFoldersInEclipse' into next
    
    a7d8d49 -fix VirtualFolders in Eclipse under Windows
    303c7e8 KWSys Nightly Date Stamp
    19e3397 KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a7d8d49b8fc829e76686cbc4cc808db4a8542994
commit a7d8d49b8fc829e76686cbc4cc808db4a8542994
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Fri May 6 22:44:45 2011 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Fri May 6 22:44:45 2011 +0200

    -fix VirtualFolders in Eclipse under Windows
    
    Under Windows "locationURI" must be used for virtual folders, while
    "location" must be used only for linked folders. Under Linux it doesn't
    seem to matter.
    
    Alex

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index c4ea425..8e26b8e 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -403,7 +403,7 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
   // for each sub project create a linked resource to the source dir
   // - only if it is an out-of-source build
   this->AppendLinkedResource(fout, "[Subprojects]",
-                             "virtual:/virtual");
+                             "virtual:/virtual", true);
 
   for (std::map<cmStdString, std::vector<cmLocalGenerator*> >::const_iterator
        it = this->GlobalGenerator->GetProjectMap().begin();
@@ -1082,17 +1082,24 @@ void cmExtraEclipseCDT4Generator
 void cmExtraEclipseCDT4Generator
 ::AppendLinkedResource (cmGeneratedFileStream& fout,
                         const std::string&     name,
-                        const std::string&     path)
+                        const std::string&     path,
+                        bool isVirtualFolder)
 {
+  const char* locationTag = "location";
+  if (isVirtualFolder) // ... and not a linked folder
+    {
+    locationTag = "locationURI";
+    }
+
   fout <<
     "\t\t<link>\n"
     "\t\t\t<name>"
     << cmExtraEclipseCDT4Generator::EscapeForXML(name)
     << "</name>\n"
     "\t\t\t<type>2</type>\n"
-    "\t\t\t<locationURI>"
+    "\t\t\t<" << locationTag << ">"
     << cmExtraEclipseCDT4Generator::EscapeForXML(path)
-    << "</locationURI>\n"
+    << "</" << locationTag << ">\n"
     "\t\t</link>\n"
     ;
 }
diff --git a/Source/cmExtraEclipseCDT4Generator.h b/Source/cmExtraEclipseCDT4Generator.h
index 99e69c4..a683731 100644
--- a/Source/cmExtraEclipseCDT4Generator.h
+++ b/Source/cmExtraEclipseCDT4Generator.h
@@ -87,7 +87,8 @@ private:
 
   static void AppendLinkedResource (cmGeneratedFileStream& fout,
                                     const std::string&     name,
-                                    const std::string&     path);
+                                    const std::string&     path,
+                                    bool isVirtualFolder = false);
 
   bool AppendOutLinkedResource(cmGeneratedFileStream& fout,
                                const std::string&     defname,

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

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


hooks/post-receive
-- 
CMake