diff options
| author | David Cole <david.cole@kitware.com> | 2008-02-15 16:49:58 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2008-02-15 16:49:58 (GMT) |
| commit | ca2a16c0a221bb0c3be4491125c044c9112836e0 (patch) | |
| tree | 38e2fab8d33aaf4915039dede364d6d34d815744 /Source/cmGlobalVisualStudio8Generator.cxx | |
| parent | ed76198b840b83d49ee4eba9ca0c7753b41d54cf (diff) | |
| download | CMake-ca2a16c0a221bb0c3be4491125c044c9112836e0.zip CMake-ca2a16c0a221bb0c3be4491125c044c9112836e0.tar.gz CMake-ca2a16c0a221bb0c3be4491125c044c9112836e0.tar.bz2 | |
ENH: Add code to support calling the VS reload macro from Visual Studio 7.1 and 9.0 in addition to 8.0 sp1... Make new macros file with VS 7.1 so that it can be read by 7.1 and later. VS 7.1 does not appear to run the macros while a build is in progress, but does not return any errors either, so for now, the reload macro is not called when using 7.1. If I can figure out how to get 7.1 to execute the macro, I will uncomment the code in cmGlobalVisualStudio71Generator::GetUserMacrosDirectory() to activate executing the macros in VS 7.1, too.
Diffstat (limited to 'Source/cmGlobalVisualStudio8Generator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudio8Generator.cxx | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx index 7a39459..52225aa 100644 --- a/Source/cmGlobalVisualStudio8Generator.cxx +++ b/Source/cmGlobalVisualStudio8Generator.cxx @@ -20,8 +20,7 @@ #include "cmMakefile.h" #include "cmake.h" - - +//---------------------------------------------------------------------------- cmGlobalVisualStudio8Generator::cmGlobalVisualStudio8Generator() { this->FindMakeProgramFile = "CMakeVS8FindMake.cmake"; @@ -29,8 +28,7 @@ cmGlobalVisualStudio8Generator::cmGlobalVisualStudio8Generator() this->PlatformName = "Win32"; } - - +//---------------------------------------------------------------------------- ///! Create a local generator appropriate to this Global Generator cmLocalGenerator *cmGlobalVisualStudio8Generator::CreateLocalGenerator() { @@ -40,8 +38,8 @@ cmLocalGenerator *cmGlobalVisualStudio8Generator::CreateLocalGenerator() lg->SetGlobalGenerator(this); return lg; } - +//---------------------------------------------------------------------------- // ouput standard header for dsw file void cmGlobalVisualStudio8Generator::WriteSLNHeader(std::ostream& fout) { @@ -100,12 +98,6 @@ std::string cmGlobalVisualStudio8Generator::GetUserMacrosDirectory() { cmSystemTools::ConvertToUnixSlashes(base); - // 7.0 macros folder: - //path = base + "/VSMacros"; - - // 7.1 macros folder: - //path = base + "/VSMacros71"; - // 8.0 macros folder: path = base + "/VSMacros80"; } @@ -116,6 +108,12 @@ std::string cmGlobalVisualStudio8Generator::GetUserMacrosDirectory() } //---------------------------------------------------------------------------- +std::string cmGlobalVisualStudio8Generator::GetUserMacrosRegKeyBase() +{ + return "Software\\Microsoft\\VisualStudio\\8.0\\vsmacros"; +} + +//---------------------------------------------------------------------------- void cmGlobalVisualStudio8Generator::Generate() { // Add a special target on which all other targets depend that |