[Cmake-commits] [cmake-commits] king committed cmGlobalVisualStudio10Generator.h 1.3 1.4 cmGlobalVisualStudio6Generator.h 1.30 1.31 cmGlobalVisualStudio71Generator.h 1.19 1.20 cmGlobalVisualStudio7Generator.h 1.50 1.51 cmGlobalVisualStudio8Generator.h 1.15 1.16 cmGlobalVisualStudio9Generator.h 1.4 1.5 cmGlobalVisualStudioGenerator.cxx 1.16 1.17 cmGlobalVisualStudioGenerator.h 1.10 1.11

[cmake-commits at cmake.org]

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

Modified Files:
	cmGlobalVisualStudio10Generator.h 
	cmGlobalVisualStudio6Generator.h 
	cmGlobalVisualStudio71Generator.h 
	cmGlobalVisualStudio7Generator.h 
	cmGlobalVisualStudio8Generator.h 
	cmGlobalVisualStudio9Generator.h 
	cmGlobalVisualStudioGenerator.cxx 
	cmGlobalVisualStudioGenerator.h 
Log Message:
Create VS generator GetRegistryBase method

This method returns the registry key

  HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\<version>

A protected GetIDEVersion method retrieves the version-specific part of
the key name.


Index: cmGlobalVisualStudio8Generator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio8Generator.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C 2 -d -r1.15 -r1.16
*** cmGlobalVisualStudio8Generator.h	4 Sep 2009 16:37:53 -0000	1.15
--- cmGlobalVisualStudio8Generator.h	16 Sep 2009 15:44:07 -0000	1.16
***************
*** 65,68 ****
--- 65,69 ----
  
  protected:
+   virtual const char* GetIDEVersion() { return "8.0"; }
  
    virtual bool VSLinksDependencies() const { return false; }

Index: cmGlobalVisualStudio10Generator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio10Generator.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** cmGlobalVisualStudio10Generator.h	10 Jul 2009 13:12:27 -0000	1.3
--- cmGlobalVisualStudio10Generator.h	16 Sep 2009 15:44:01 -0000	1.4
***************
*** 74,77 ****
--- 74,79 ----
    virtual const char* GetCMakeCFGInitDirectory() 
      { return "$(ConfigurationName)";} 
+ protected:
+   virtual const char* GetIDEVersion() { return "10.0"; }
  };
  #endif

Index: cmGlobalVisualStudio9Generator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio9Generator.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** cmGlobalVisualStudio9Generator.h	15 Feb 2008 16:49:58 -0000	1.4
--- cmGlobalVisualStudio9Generator.h	16 Sep 2009 15:44:08 -0000	1.5
***************
*** 66,69 ****
--- 66,71 ----
     */
    virtual std::string GetUserMacrosRegKeyBase();
+ protected:
+   virtual const char* GetIDEVersion() { return "9.0"; }
  };
  #endif

Index: cmGlobalVisualStudioGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudioGenerator.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C 2 -d -r1.10 -r1.11
*** cmGlobalVisualStudioGenerator.h	17 Jul 2009 14:05:52 -0000	1.10
--- cmGlobalVisualStudioGenerator.h	16 Sep 2009 15:44:08 -0000	1.11
***************
*** 69,72 ****
--- 69,74 ----
    const char* GetUtilityForTarget(cmTarget& target, const char*);
  
+   /** Get the top-level registry key for this VS version.  */
+   std::string GetRegistryBase();
  protected:
    void FixUtilityDepends();
***************
*** 77,80 ****
--- 79,83 ----
    virtual bool VSLinksDependencies() const { return true; }
  
+   virtual const char* GetIDEVersion() = 0;
  private:
    void FixUtilityDependsForTarget(cmTarget& target);

Index: cmGlobalVisualStudio7Generator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio7Generator.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -C 2 -d -r1.50 -r1.51
*** cmGlobalVisualStudio7Generator.h	29 Jul 2009 15:28:54 -0000	1.50
--- cmGlobalVisualStudio7Generator.h	16 Sep 2009 15:44:06 -0000	1.51
***************
*** 104,107 ****
--- 104,109 ----
  
  protected:
+   virtual const char* GetIDEVersion() { return "7.0"; }
+ 
    static cmIDEFlagTable const* GetExtraFlagTableVS7();
    virtual void OutputSLNFile(cmLocalGenerator* root, 

Index: cmGlobalVisualStudio6Generator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio6Generator.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -C 2 -d -r1.30 -r1.31
*** cmGlobalVisualStudio6Generator.h	14 Jul 2009 18:16:46 -0000	1.30
--- cmGlobalVisualStudio6Generator.h	16 Sep 2009 15:44:03 -0000	1.31
***************
*** 89,92 ****
--- 89,95 ----
    ///! What is the configurations directory variable called?
    virtual const char* GetCMakeCFGInitDirectory()  { return "$(IntDir)"; }
+ 
+ protected:
+   virtual const char* GetIDEVersion() { return "6.0"; }
  private:
    void GenerateConfigurations(cmMakefile* mf);

Index: cmGlobalVisualStudio71Generator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio71Generator.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C 2 -d -r1.19 -r1.20
*** cmGlobalVisualStudio71Generator.h	14 Jul 2009 18:16:46 -0000	1.19
--- cmGlobalVisualStudio71Generator.h	16 Sep 2009 15:44:04 -0000	1.20
***************
*** 58,61 ****
--- 58,62 ----
  
  protected:
+   virtual const char* GetIDEVersion() { return "7.1"; }
    virtual void AddPlatformDefinitions(cmMakefile* mf);
    virtual void WriteSLNFile(std::ostream& fout, 

Index: cmGlobalVisualStudioGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudioGenerator.cxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -C 2 -d -r1.16 -r1.17
*** cmGlobalVisualStudioGenerator.cxx	14 Jul 2009 18:16:46 -0000	1.16
--- cmGlobalVisualStudioGenerator.cxx	16 Sep 2009 15:44:08 -0000	1.17
***************
*** 33,36 ****
--- 33,44 ----
  
  //----------------------------------------------------------------------------
+ std::string cmGlobalVisualStudioGenerator::GetRegistryBase()
+ {
+   std::string key = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\";
+   key += this->GetIDEVersion();
+   return key;
+ }
+ 
+ //----------------------------------------------------------------------------
  void cmGlobalVisualStudioGenerator::Generate()
  {