[Cmake-commits] CMake branch, next, updated. v2.8.5-1529-gf864aa4

[David Cole]

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  f864aa4885c1e40c88f77d02edac36402a2d6a36 (commit)
       via  ac22e2a8790e507d7600e0876585424db70f785b (commit)
       via  65ba6da57661dc50412929c9321268af77ecb59a (commit)
      from  056093d5ef2f8ae4f5e8b939807201ef90138e1f (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=f864aa4885c1e40c88f77d02edac36402a2d6a36
commit f864aa4885c1e40c88f77d02edac36402a2d6a36
Merge: 056093d ac22e2a
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Aug 12 17:26:32 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 12 17:26:32 2011 -0400

    Merge topic 'add-vs9-midl-inc-dirs' into next
    
    ac22e2a VS9: Add include_directories to midl command lines
    65ba6da KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ac22e2a8790e507d7600e0876585424db70f785b
commit ac22e2a8790e507d7600e0876585424db70f785b
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Aug 12 17:08:35 2011 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Fri Aug 12 17:12:08 2011 -0400

    VS9: Add include_directories to midl command lines
    
    Makes VS 7, 8 and 9 generators consistent with the VS 10
    generator. Adds the "AdditionalIncludeDirectories" attribute
    at the vcproj level so that all idl files inherit the /I
    command line args.

diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 3e76f59..223e786 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -825,6 +825,13 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
     tool = "VFMIDLTool";
     }
   fout << "\t\t\t<Tool\n\t\t\t\tName=\"" << tool << "\"\n";
+  fout << "\t\t\t\tAdditionalIncludeDirectories=\"";
+  for(i = includes.begin(); i != includes.end(); ++i)
+    {
+    std::string ipath = this->ConvertToXMLOutputPath(i->c_str());
+    fout << ipath << ";";
+    }
+  fout << "\"\n";
   fout << "\t\t\t\tMkTypLibCompatible=\"FALSE\"\n";
   if( this->PlatformName == "x64" )
     {

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

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


hooks/post-receive
-- 
CMake