kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix include order because of GetCurrentDirectory define and windows.h problem

This commit is contained in:
Bill Hoffman 2004-06-15 08:30:22 -04:00
parent b6466061cb
commit 1d061ae896
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/cmGlobalVisualStudio6Generator.cxx
View File

@ -216,7 +216,6 @@ void cmGlobalVisualStudio6Generator::WriteDSWFile(std::ostream& fout,
this->WriteDSWHeader(fout); this->WriteDSWHeader(fout);
// Get the home directory with the trailing slash // Get the home directory with the trailing slash
#undef GetCurrentDirectory
std::string homedir = root->GetMakefile()->GetCurrentDirectory(); std::string homedir = root->GetMakefile()->GetCurrentDirectory();
homedir += "/"; homedir += "/";

4
Source/cmGlobalVisualStudio71Generator.cxx
View File

@ -14,11 +14,12 @@
PURPOSE. See the above copyright notices for more information. PURPOSE. See the above copyright notices for more information.
=========================================================================*/ =========================================================================*/
#include "windows.h" // this must be first to define GetCurrentDirectory
#include "cmGlobalVisualStudio71Generator.h" #include "cmGlobalVisualStudio71Generator.h"
#include "cmLocalVisualStudio7Generator.h" #include "cmLocalVisualStudio7Generator.h"
#include "cmMakefile.h" #include "cmMakefile.h"
#include "cmake.h" #include "cmake.h"
#include "windows.h"
cmGlobalVisualStudio71Generator::cmGlobalVisualStudio71Generator() cmGlobalVisualStudio71Generator::cmGlobalVisualStudio71Generator()
@ -48,7 +49,6 @@ void cmGlobalVisualStudio71Generator::WriteSLNFile(std::ostream& fout,
this->WriteSLNHeader(fout); this->WriteSLNHeader(fout);
// Get the home directory with the trailing slash // Get the home directory with the trailing slash
#undef GetCurrentDirectory
std::string homedir = root->GetMakefile()->GetCurrentDirectory(); std::string homedir = root->GetMakefile()->GetCurrentDirectory();
homedir += "/"; homedir += "/";
bool doneAllBuild = false; bool doneAllBuild = false;

3
Source/cmGlobalVisualStudio7Generator.cxx
View File

@ -14,12 +14,12 @@
PURPOSE. See the above copyright notices for more information. PURPOSE. See the above copyright notices for more information.
=========================================================================*/ =========================================================================*/
#include "windows.h" // this must be first to define GetCurrentDirectory
#include "cmGlobalVisualStudio7Generator.h" #include "cmGlobalVisualStudio7Generator.h"
#include "cmLocalVisualStudio7Generator.h" #include "cmLocalVisualStudio7Generator.h"
#include "cmGeneratedFileStream.h" #include "cmGeneratedFileStream.h"
#include "cmMakefile.h" #include "cmMakefile.h"
#include "cmake.h" #include "cmake.h"
#include "windows.h"
cmGlobalVisualStudio7Generator::cmGlobalVisualStudio7Generator() cmGlobalVisualStudio7Generator::cmGlobalVisualStudio7Generator()
@ -316,7 +316,6 @@ void cmGlobalVisualStudio7Generator::WriteSLNFile(std::ostream& fout,
this->WriteSLNHeader(fout); this->WriteSLNHeader(fout);
// Get the home directory with the trailing slash // Get the home directory with the trailing slash
#undef GetCurrentDirectory
std::string homedir = root->GetMakefile()->GetCurrentDirectory(); std::string homedir = root->GetMakefile()->GetCurrentDirectory();
homedir += "/"; homedir += "/";
bool doneAllBuild = false; bool doneAllBuild = false;