diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2008-01-15 19:00:52 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2008-01-15 19:00:52 (GMT) |
| commit | a7e1031efed8f95b58dc25e92bd5c977063da31e (patch) | |
| tree | ee9d59afc9594a067fe21fb524f53589d8ff63c8 | |
| parent | feea7133ef7b48a5b39b2f0c8b1e86e5e159dc29 (diff) | |
| download | CMake-a7e1031efed8f95b58dc25e92bd5c977063da31e.zip CMake-a7e1031efed8f95b58dc25e92bd5c977063da31e.tar.gz CMake-a7e1031efed8f95b58dc25e92bd5c977063da31e.tar.bz2 | |
ENH: remove patch as directory change was already fixed
| -rw-r--r-- | Source/QtDialog/README | 4 | ||||
| -rw-r--r-- | Source/cmGlobalVisualStudio7Generator.cxx | 18 | ||||
| -rw-r--r-- | Source/cmLocalVisualStudioGenerator.cxx | 7 |
3 files changed, 21 insertions, 8 deletions
diff --git a/Source/QtDialog/README b/Source/QtDialog/README index d1b38c4..0701a2b 100644 --- a/Source/QtDialog/README +++ b/Source/QtDialog/README @@ -1 +1,3 @@ -This is the Qt interface to CMake. It has a BSD license compatible with the Qt license.
\ No newline at end of file +This is the Qt interface to CMake. It has a BSD license compatible with the +Qt license exception. Only developers with a paid QT license are permitted +to make changes to this code. Small patches and bug fixes can diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx index 1ef34bc..1b95e2a 100644 --- a/Source/cmGlobalVisualStudio7Generator.cxx +++ b/Source/cmGlobalVisualStudio7Generator.cxx @@ -284,6 +284,24 @@ void cmGlobalVisualStudio7Generator bool doneRebuildCache = false; bool donePackage = false; + + // 1. + // Collecte all targets in generators vector and the targets + // that they depend on + + // 2. loop over all targets and put .vcproj reference + // into .sln file. .vcproj files should already exist + // from local generation step. Do not add "pulled" in .vcproj + // to ALL_BUILD. + // See: cmGlobalGenerator::GetTargetDepends + // cmGlobalGenerator::TargetDependSet myset; + // foreach t in all targets + // cmGlobalGenerator::TargetDependSet const& tset = GetTargetDepends(t); + // myset.insert(tset.begin(), tset.end()); + // foreach t in myset + // t->GetMakefile()->GetLocalGenerator()->GetVCProjPath() + // if t was not in original set of targets disable all for it + // For each cmMakefile, create a VCProj for it, and // add it to this SLN file unsigned int i; diff --git a/Source/cmLocalVisualStudioGenerator.cxx b/Source/cmLocalVisualStudioGenerator.cxx index a12a4db..66be038 100644 --- a/Source/cmLocalVisualStudioGenerator.cxx +++ b/Source/cmLocalVisualStudioGenerator.cxx @@ -144,13 +144,6 @@ cmLocalVisualStudioGenerator script += newline; newline = newline_text; script += "cd "; - OSVERSIONINFO osv; - osv.dwOSVersionInfoSize = sizeof(osv); - GetVersionEx(&osv); - if(osv.dwPlatformId != VER_PLATFORM_WIN32_WINDOWS) - { - script += "/d "; - } script += this->Convert(workingDirectory, START_OUTPUT, SHELL); // Change the working drive. |