[Cmake-commits] [cmake-commits] king committed cmVisualStudio10TargetGenerator.cxx 1.22 1.23

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv23247/Source

Modified Files:
	cmVisualStudio10TargetGenerator.cxx 
Log Message:
Fix Microsoft.Cpp.$(Platform).user.props in VS10b2

MS changed the location of the Microsoft.Cpp.$(Platform).user.props
file.  This commit teaches the VS 10 generator about the new location.

See issue #9759.


Index: cmVisualStudio10TargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmVisualStudio10TargetGenerator.cxx,v
retrieving revision 1.22
retrieving revision 1.23
diff -C 2 -d -r1.22 -r1.23
*** cmVisualStudio10TargetGenerator.cxx	22 Oct 2009 12:24:11 -0000	1.22
--- cmVisualStudio10TargetGenerator.cxx	22 Oct 2009 14:21:35 -0000	1.23
***************
*** 104,107 ****
--- 104,108 ----
  }
  
+ #define VS10_USER_PROPS "$(UserRootDir)\\Microsoft.Cpp.$(Platform).user.props"
  
  void cmVisualStudio10TargetGenerator::Generate()
***************
*** 154,163 ****
    this->WriteString("</ImportGroup>\n", 1);
    this->WriteString("<ImportGroup Label=\"PropertySheets\">\n", 1);
!   this->WriteString("<Import Project="
!                     "\"$(LocalAppData)\\Microsoft\\VisualStudio\\10.0\\"
!                     "Microsoft.Cpp.$(Platform).user.props\" "
!                     "Condition=\"exists('$(LocalAppData)\\Microsoft"
!                     "\\VisualStudio\\10.0\\"
!                     "Microsoft.Cpp.$(Platform).user.props')\" />\n", 2);
    this->WriteString("</ImportGroup>\n", 1);
    this->WriteString("<PropertyGroup Label=\"UserMacros\" />\n", 1);
--- 155,161 ----
    this->WriteString("</ImportGroup>\n", 1);
    this->WriteString("<ImportGroup Label=\"PropertySheets\">\n", 1);
!   this->WriteString("<Import Project=\"" VS10_USER_PROPS "\""
!                     " Condition=\"exists('" VS10_USER_PROPS "')\""
!                     " Label=\"LocalAppDataPlatform\" />", 2);
    this->WriteString("</ImportGroup>\n", 1);
    this->WriteString("<PropertyGroup Label=\"UserMacros\" />\n", 1);