[Cmake-commits] [cmake-commits] king committed cmGlobalVisualStudio10Generator.h 1.5 1.6

[cmake-commits at cmake.org]

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

Modified Files:
	cmGlobalVisualStudio10Generator.h 
Log Message:
Fix VS 10 value of CMAKE_CFG_INTDIR

VS 10 provides $(Configuration) and $(ConfigurationName) but only the
former is documented so we prefer it.  This also makes CMAKE_CFG_INTDIR
consistent with its documentation.  See issue #9916.


Index: cmGlobalVisualStudio10Generator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio10Generator.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** cmGlobalVisualStudio10Generator.h	28 Sep 2009 15:42:41 -0000	1.5
--- cmGlobalVisualStudio10Generator.h	18 Nov 2009 20:50:29 -0000	1.6
***************
*** 68,72 ****
    virtual std::string GetUserMacrosRegKeyBase();
    virtual const char* GetCMakeCFGInitDirectory() 
!     { return "$(ConfigurationName)";} 
  protected:
    virtual const char* GetIDEVersion() { return "10.0"; }
--- 68,72 ----
    virtual std::string GetUserMacrosRegKeyBase();
    virtual const char* GetCMakeCFGInitDirectory() 
!     { return "$(Configuration)";}
  protected:
    virtual const char* GetIDEVersion() { return "10.0"; }