From 74fc3ddca9ad64a033d37ef14d5463bd5aa48039 Mon Sep 17 00:00:00 2001
From: Milosz Hulboj <mhulboj@hulboj.org>
Date: Sat, 25 Sep 2010 20:48:01 +0200
Subject: [PATCH] ADDED: Initial support for VS Intel Projects

Intel offers a plugin that integrates well
with VS 7.1, 8 and 9. It allows to convert
any of the projects to so called "Intel
Project". Such a project is compiled with
Intel Compiler.

Up till now CMake did not offer any support
for such configurations. One had to either:
- generate a normal VS solution and use
  Intel macros to convert the projects
- generate a normal VS solution and use
  Intel command line converter

Presented approach allows to mark a project
to be created as the Intel project:
set_property(TARGET hello PROPERTY VS_INTEL_PROJECT TRUE)

Seems to handle the new FOLDER feature and
project dependencies.

Issues:
- test different VS and Intel Compiler
  versions. So far tried only:
  - VS 9 + Intel 11.1 (32 bit)
- which version number to put in the .icproj
  files? Is there a `universal' one, that
  would work in all cases?
---
 Source/cmGlobalVisualStudio10Generator.h   |    2 +
 Source/cmGlobalVisualStudio71Generator.cxx |   17 ++++++++++-
 Source/cmGlobalVisualStudio71Generator.h   |    2 +
 Source/cmGlobalVisualStudio7Generator.cxx  |   13 ++++++++-
 Source/cmGlobalVisualStudioGenerator.cxx   |   22 ++++++++++++++-
 Source/cmGlobalVisualStudioGenerator.h     |    7 ++++
 Source/cmLocalVisualStudio7Generator.cxx   |   42 ++++++++++++++++++++++++++++
 Source/cmLocalVisualStudio7Generator.h     |    2 +
 Source/cmTarget.cxx                        |    6 ++++
 9 files changed, 110 insertions(+), 3 deletions(-)

diff --git a/Source/cmGlobalVisualStudio10Generator.h b/Source/cmGlobalVisualStudio10Generator.h
index 219c36e..dde02fa 100644
--- a/Source/cmGlobalVisualStudio10Generator.h
+++ b/Source/cmGlobalVisualStudio10Generator.h
@@ -68,6 +68,8 @@ public:
   virtual std::string GetUserMacrosRegKeyBase();
   virtual const char* GetCMakeCFGInitDirectory() 
     { return "$(Configuration)";}
+
+  virtual bool TargetIsIntelProject(cmTarget& t) {return false;}
 protected:
   virtual const char* GetIDEVersion() { return "10.0"; }
 };
diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index ba18687..f2f97ff 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -94,6 +94,14 @@ std::string cmGlobalVisualStudio71Generator::GetUserMacrosRegKeyBase()
 #endif
 }
 
+
+//----------------------------------------------------------------------------
+bool cmGlobalVisualStudio71Generator
+::TargetIsIntelProject(cmTarget& t)
+{
+    return t.GetProperty("VS_INTEL_PROJECT") && !this->TargetIsFortranOnly(t);
+}
+
 //----------------------------------------------------------------------------
 void cmGlobalVisualStudio71Generator
 ::WriteSLNFile(std::ostream& fout,
@@ -164,6 +172,7 @@ cmGlobalVisualStudio71Generator::WriteProject(std::ostream& fout,
                                               const char* dir,
                                               cmTarget& t)
 {
+  std::string guid = this->GetGUID(dspname);
   // check to see if this is a fortran build
   const char* ext = ".vcproj";
   const char* project = 
@@ -173,13 +182,19 @@ cmGlobalVisualStudio71Generator::WriteProject(std::ostream& fout,
     ext = ".vfproj"; 
     project = "Project(\"{6989167D-11E4-40FE-8C1A-2192A86A7E90}\") = \"";
     }
+  else if(this->TargetIsIntelProject(t))
+    {
+    ext = ".icproj";
+    project = "Project(\"{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}\") = \"";
+    std::string icProjGUIDName = this->GetIntelProjectName(dspname);
+    guid = this->GetGUID(icProjGUIDName.c_str());
+    }
   const char* targetExt = t.GetProperty("GENERATOR_FILE_NAME_EXT");
   if(targetExt)
     {
     ext = targetExt;
     }
 
-  std::string guid = this->GetGUID(dspname);
   fout << project
        << dspname << "\", \""
        << this->ConvertToSolutionPath(dir)
diff --git a/Source/cmGlobalVisualStudio71Generator.h b/Source/cmGlobalVisualStudio71Generator.h
index 81c2087..7a7acbd 100644
--- a/Source/cmGlobalVisualStudio71Generator.h
+++ b/Source/cmGlobalVisualStudio71Generator.h
@@ -51,6 +51,8 @@ public:
    */
   virtual std::string GetUserMacrosRegKeyBase();
 
+  virtual bool TargetIsIntelProject(cmTarget& t);
+
 protected:
   virtual const char* GetIDEVersion() { return "7.1"; }
   virtual void AddPlatformDefinitions(cmMakefile* mf);
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 751dc24..4c4b302 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -262,6 +262,12 @@ void cmGlobalVisualStudio7Generator::WriteTargetConfigurations(
         {
         this->WriteProjectConfigurations(fout, vcprojName,
                                          partOfDefaultBuild);
+        if(this->TargetIsIntelProject(*target))
+          {
+          std::string icProjGUIDName = this->GetIntelProjectName(vcprojName);
+          this->WriteProjectConfigurations(fout, icProjGUIDName.c_str(),
+                                           partOfDefaultBuild);
+          }
         }
       }
     }
@@ -338,7 +344,12 @@ void cmGlobalVisualStudio7Generator::WriteTargetsToSolution(
 
             if (!cumulativePath.empty())
               {
-              VisualStudioFolders[cumulativePath].insert(target->GetName());
+              std::string name = target->GetName();
+              if(this->TargetIsIntelProject(*target))
+                {
+                  name = this->GetIntelProjectName(name);
+                }
+              VisualStudioFolders[cumulativePath].insert(name);
               }
             }
           }
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index bae18a3..d4d27e1 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -278,7 +278,14 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmTarget& target)
       if(j->first != target.GetName() &&
          this->FindTarget(0, j->first.c_str()))
         {
-        vsTargetDepend.insert(j->first);
+        std::string name = j->first;
+        // It might happen that a dependency is marked as an Intel Project
+        cmTarget * dep = this->FindTarget(0, name.c_str());
+        if(dep && this->TargetIsIntelProject(*dep))
+          {
+            name = this->GetIntelProjectName(name);
+          }
+        vsTargetDepend.insert(name);
         }
       }
     }
@@ -289,6 +296,12 @@ void cmGlobalVisualStudioGenerator::ComputeVSTargetDepends(cmTarget& target)
     if(*i != target.GetName())
       {
       std::string name = this->GetUtilityForTarget(target, i->c_str());
+      // It might happen that a dependency is marked as an Intel Project
+      cmTarget * dep = this->FindTarget(0, name.c_str());
+      if(dep && this->TargetIsIntelProject(*dep))
+        {
+        name = this->GetIntelProjectName(name);
+        }
       vsTargetDepend.insert(name);
       }
     }
@@ -369,6 +382,13 @@ cmGlobalVisualStudioGenerator::GetUtilityForTarget(cmTarget& target,
 }
 
 //----------------------------------------------------------------------------
+std::string cmGlobalVisualStudioGenerator
+::GetIntelProjectName(const std::string& name) const
+{
+    return name + "_INTEL_PROJECT_PLACEHOLDER";
+}
+
+//----------------------------------------------------------------------------
 #include <windows.h>
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmGlobalVisualStudioGenerator.h b/Source/cmGlobalVisualStudioGenerator.h
index daa6b3a..f4f2ecc 100644
--- a/Source/cmGlobalVisualStudioGenerator.h
+++ b/Source/cmGlobalVisualStudioGenerator.h
@@ -69,6 +69,13 @@ public:
       i.e. "Can I build Debug and Release in the same tree?" */
   virtual bool IsMultiConfig() { return true; }
 
+  /** Return true if the target has been marked as Intel Project
+      AND the given version of the Visual Studio supports such
+      projects. */
+  virtual bool TargetIsIntelProject(cmTarget& t) {return false;}
+
+  std::string GetIntelProjectName(const std::string& name) const;
+
 protected:
   // Does this VS version link targets to each other if there are
   // dependencies in the SLN file?  This was done for VS versions
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index cb34bb6..c194875 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -210,6 +210,7 @@ void cmLocalVisualStudio7Generator
   fname = this->Makefile->GetStartOutputDirectory();
   fname += "/";
   fname += lname;
+  std::string icFName = fname;
   if(this->FortranProject)
     {
     fname += ".vfproj";
@@ -217,6 +218,7 @@ void cmLocalVisualStudio7Generator
   else
     {
     fname += ".vcproj";
+    icFName += ".icproj";
     }
 
   // Generate the project file and replace it atomically with
@@ -229,6 +231,16 @@ void cmLocalVisualStudio7Generator
     {
     this->GlobalGenerator->FileReplacedDuringGenerate(fname);
     }
+  if(static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator)
+      ->TargetIsIntelProject(target))
+    {
+    cmGeneratedFileStream icFOut(icFName.c_str());
+    this->WriteICProjFile(icFOut,lname,target);
+    if (icFOut.Close())
+      {
+      this->GlobalGenerator->FileReplacedDuringGenerate(icFName);
+      }
+    }
 }
 
 //----------------------------------------------------------------------------
@@ -1197,6 +1209,36 @@ cmLocalVisualStudio7Generator
     }
 }
 
+void cmLocalVisualStudio7Generator::WriteICProjFile(std::ostream& fout,
+                                                    const char *libName,
+                                                    cmTarget &target)
+{
+  fout << "<?xml version=\"1.0\" encoding=\"Windows-1252\"?>\n"
+       << "<VisualStudioProject\n"
+       << "\tProjectType=\"Intel C++ Project\"\n";
+  // TODO: Which are the valid versions? Is there a common one that works?
+  fout << "\tVersion=\"11.1\"\n";
+  const char* projLabel = target.GetProperty("PROJECT_LABEL");
+  if(!projLabel)
+    {
+    projLabel = libName;
+    }
+  fout << "\tName=\"" << projLabel << "\"\n";
+  cmGlobalVisualStudio7Generator* gg =
+    static_cast<cmGlobalVisualStudio7Generator *>(this->GlobalGenerator);
+  // We need the UUID for the Intel Project
+  // (in addition to the one for the standard vcproj)
+  std::string icProjGUIDName = gg->GetIntelProjectName(projLabel);
+  gg->CreateGUID(icProjGUIDName.c_str());
+  fout << "\tProjectGUID=\"{" << gg->GetGUID(icProjGUIDName.c_str()) 
+       << "}\"\n";
+  fout << "\tVCNestedProjectGUID=\"{" << gg->GetGUID(libName) << "}\"\n";
+  fout << "\tVCNestedProjectFileName=\"" << libName << ".vcproj\">\n";
+  fout << "\t<Configurations/>\n";
+  fout << "\t<Files/>\n";
+  fout << "</VisualStudioProject>\n";
+}
+
 void cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream& fout,
                                                     const char *libName,
                                                     cmTarget &target)
diff --git a/Source/cmLocalVisualStudio7Generator.h b/Source/cmLocalVisualStudio7Generator.h
index 19f7b97..d68a15e 100644
--- a/Source/cmLocalVisualStudio7Generator.h
+++ b/Source/cmLocalVisualStudio7Generator.h
@@ -86,6 +86,8 @@ private:
                          cmTarget &tgt, std::vector<cmSourceGroup> &sgs);
   void WriteVCProjFooter(std::ostream& fout);
   void CreateSingleVCProj(const char *lname, cmTarget &tgt);
+  void WriteICProjFile(std::ostream& fout, const char *libName, 
+                       cmTarget &tgt);
   void WriteVCProjFile(std::ostream& fout, const char *libName, 
                        cmTarget &tgt);
   void WriteConfigurations(std::ostream& fout,
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 458d1a5..f460d66 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -861,6 +861,12 @@ void cmTarget::DefineProperties(cmake *cm)
      "FOLDER property value will appear next to each other in a "
      "folder of that name. To nest folders, use FOLDER values such "
      "as 'GUI/Dialogs' with '/' characters separating folder levels.");
+  
+  cm->DefineProperty
+    ("VS_INTEL_PROJECT", cmProperty::TARGET,
+     "Indicate that a given target is an Intel C++ Compiler project.",
+     "Target with VS_INTEL_PROJECT property will have additional "
+     ".icproj project files generated.");
 
   cm->DefineProperty
     ("PROJECT_LABEL", cmProperty::TARGET,
-- 
1.7.0.2.msysgit.0

From 707350c43d2bad8f9cc73f3e53d2f05ac8e681bb Mon Sep 17 00:00:00 2001
From: Milosz Hulboj <mhulboj@hulboj.org>
Date: Tue, 5 Oct 2010 11:22:01 +0200
Subject: [PATCH] ADDED: Support for the global/local VS_PROJECT_TYPE flag.

---
 Source/cmGlobalVisualStudio71Generator.cxx |   21 ++++++++++++++++++++-
 Source/cmTarget.cxx                        |    1 +
 2 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index f2f97ff..a574c82 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -99,7 +99,26 @@ std::string cmGlobalVisualStudio71Generator::GetUserMacrosRegKeyBase()
 bool cmGlobalVisualStudio71Generator
 ::TargetIsIntelProject(cmTarget& t)
 {
-    return t.GetProperty("VS_INTEL_PROJECT") && !this->TargetIsFortranOnly(t);
+  std::string vs_project_type = "MSVC";
+  const char* tmp = t.GetProperty("VS_PROJECT_TYPE");
+  if (tmp)
+    vs_project_type = tmp;
+
+  if (vs_project_type == "MSVC")
+    return false;
+  else if(vs_project_type == "Intel")
+    {
+    return !this->TargetIsFortranOnly(t);
+    }
+  else
+    {
+    std::stringstream message;
+    message << "Target: " << t.GetName() <<
+               " has unknown VS_PROJECT_TYPE '" <<
+               vs_project_type << "'";
+    cmSystemTools::Error(message.str().c_str());
+    return false;
+    }
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index ed32590..3e892ae 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1061,6 +1061,7 @@ void cmTarget::SetMakefile(cmMakefile* mf)
   this->SetPropertyDefault("RUNTIME_OUTPUT_DIRECTORY", 0);
   this->SetPropertyDefault("Fortran_MODULE_DIRECTORY", 0);
   this->SetPropertyDefault("OSX_ARCHITECTURES", 0);
+  this->SetPropertyDefault("VS_PROJECT_TYPE", 0);
 
   // Collect the set of configuration types.
   std::vector<std::string> configNames;
-- 
1.7.0

From c6a55cf07d0b79b65892a836e691abbfed1e2dd3 Mon Sep 17 00:00:00 2001
From: Milosz Hulboj <mhulboj@hulboj.org>
Date: Wed, 6 Oct 2010 15:17:54 +0200
Subject: [PATCH 3/3] CHANGED: Only certain VS targets should be converted to Intel Projects.

As pointed out by Brad King, only the EXECUTABLE, STATIC_LIBRARY,
SHARED_LIBRARY and  MODULE_LIBRARY projects are elligible for
.icproj file generation. Other projects (e.g. ALL_BUILD) should
remain unchanged.
---
 Source/cmGlobalVisualStudio71Generator.cxx |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index a574c82..b30cde2 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -99,6 +99,14 @@ std::string cmGlobalVisualStudio71Generator::GetUserMacrosRegKeyBase()
 bool cmGlobalVisualStudio71Generator
 ::TargetIsIntelProject(cmTarget& t)
 {
+  // Only a small subset of targets can be treated as Intel Projects.
+  if(t.GetType()!=cmTarget::EXECUTABLE &&
+	 t.GetType()!=cmTarget::STATIC_LIBRARY &&
+	 t.GetType()!=cmTarget::SHARED_LIBRARY &&
+	 t.GetType()!=cmTarget::MODULE_LIBRARY)
+    {
+    return false;
+    }
   std::string vs_project_type = "MSVC";
   const char* tmp = t.GetProperty("VS_PROJECT_TYPE");
   if (tmp)
-- 
1.7.0.2.msysgit.0

From 2d094644cf40744f3fb7f6ac09eb918c74502e75 Mon Sep 17 00:00:00 2001
From: Milosz Hulboj <mhulboj@hulboj.org>
Date: Wed, 6 Oct 2010 17:11:16 +0200
Subject: [PATCH 4/4] CHANGED: Updated the VS_PROJECT_TYPE property name and description

---
 Source/cmTarget.cxx |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 3e892ae..b4bd6f0 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -881,10 +881,14 @@ void cmTarget::DefineProperties(cmake *cm)
      "as 'GUI/Dialogs' with '/' characters separating folder levels.");
   
   cm->DefineProperty
-    ("VS_INTEL_PROJECT", cmProperty::TARGET,
-     "Indicate that a given target is an Intel C++ Compiler project.",
-     "Target with VS_INTEL_PROJECT property will have additional "
-     ".icproj project files generated.");
+    ("VS_PROJECT_TYPE", cmProperty::TARGET,
+     "Set the type of the Visual Studio project.",
+     "This parameter allows to override the global CMAKE_VS_PROJECT_TYPE "
+     "setting. By default, if neither of them is set, CMake will generate "
+     "standard Visual Studio projects. This is equivalent to setting the "
+     "parameter to 'MSVC'. If one wishes to generate Intel Compiler Visual "
+     "Studio projects (that use .icproj files) it is necessary to set this "
+     "parameter (or the global one) to 'Intel'");
 
   cm->DefineProperty
     ("PROJECT_LABEL", cmProperty::TARGET,
-- 
1.7.0.2.msysgit.0